diff options
| author | Johannes Stoelp <johannes.stoelp@gmail.com> | 2023-11-04 20:38:54 +0100 |
|---|---|---|
| committer | Johannes Stoelp <johannes.stoelp@gmail.com> | 2023-11-04 20:38:54 +0100 |
| commit | 85f498bc0749ba8479357d96994c9b46d36c5a52 (patch) | |
| tree | 9ab749888b144b9698ff24137ca1cc6c0c51c91d | |
| parent | 8fdf3ac14b5d2deb19997452fe41092442cfdff6 (diff) | |
| download | sysc-playground-85f498bc0749ba8479357d96994c9b46d36c5a52.tar.gz sysc-playground-85f498bc0749ba8479357d96994c9b46d36c5a52.zip | |
cmake: rename systemc files and fix Makefile
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | cmake/SystemC-external.cmake (renamed from cmake/CMakeLists-sysc-external.txt) | 0 | ||||
| -rw-r--r-- | cmake/SystemC-fetch.cmake (renamed from cmake/CMakeLists-sysc-fetch.txt) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d1526f..144ae9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.14) project(systemc_playground CXX) # Include SYSTEMC either as source or external project. -#include(cmake/CMakeLists-sysc-fetch.txt) -include(cmake/CMakeLists-sysc-external.txt) +#include(cmake/SystemC-fetch.cmake) +include(cmake/SystemC-external.cmake) set(simulations event @@ -9,8 +9,8 @@ ifeq ($V,1) CCTEST_FLAGS += --verbose endif -SRCS = $(shell find src test -type f -name \*.h -or -name \*.cc) -BINS = $(SRCS:src/%.cc=BUILD/pg-%) +SIMS= $(wildcard src/*.cc) +BINS = $(SIMS:src/%.cc=BUILD/pg-%) # -- SYSTEMC PLAYGROUND -------------------------------------------------------- @@ -30,7 +30,7 @@ run/%: config test: build cd BUILD/test && ctest --output-on-failure $(CCTEST_FLAGS) -config: BUILD/CMakeCache.txt cmake/CMakeLists-sysc-external.txt cmake/CMakeLists-sysc-fetch.txt +config: BUILD/CMakeCache.txt cmake/SystemC-external.cmake cmake/SystemC-fetch.cmake BUILD/CMakeCache.txt: CMakeLists.txt # SystemC options: # BUILD_SHARED_LIBS @@ -49,7 +49,7 @@ targets: ninja -C BUILD -t targets fmt: - clang-format -i $(SRCS) + clang-format -i $(shell shell find src test -type f -name \*.h -or -name \*.cc) # -- CLEAN --------------------------------------------------------------------- @@ -31,10 +31,10 @@ Happy hacking. The SystemC simulator is automatically built as dependency in cmake. Currently two different build scripts are available (mainly because of own experiments). -- [CMakeLists-sysc-fetch.txt](cmake/CMakeLists-sysc-fetch.txt) use +- [SystemC-fetch.cmake](cmake/SystemC-fetch.cmake) use [`FetchContent`][cmake-fetch] to make SystemC available, this will treat SystemC as source dependency and make all build targets available. -- [CMakeLists-sysc-external.txt](cmake/CMakeLists-sysc-external.txt) use +- [SystemC-external.cmake](cmake/SystemC-external.cmake) use [`ExternalProject`][cmake-external] to make SystemC available, this will treat SystemC as external dependency and therefore needs to provide targets manually. diff --git a/cmake/CMakeLists-sysc-external.txt b/cmake/SystemC-external.cmake index 8346c34..8346c34 100644 --- a/cmake/CMakeLists-sysc-external.txt +++ b/cmake/SystemC-external.cmake diff --git a/cmake/CMakeLists-sysc-fetch.txt b/cmake/SystemC-fetch.cmake index 4afd154..4afd154 100644 --- a/cmake/CMakeLists-sysc-fetch.txt +++ b/cmake/SystemC-fetch.cmake |