diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 23:31:51 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-22 23:31:51 +0200 |
| commit | 36a385347556b046df223012986ae35970279751 (patch) | |
| tree | c743cc8b59541555864aad31d53e85762c721c62 | |
| parent | fb914871bf169e8cd6f74cc086cabd5b23e6f739 (diff) | |
build draw/ with src/ as one target
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | draw/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56327efe..fc6fa890 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,6 @@ include_directories(SYSTEM ) add_subdirectory(src) -add_subdirectory(draw) add_subdirectory(main) add_subdirectory(anim-crop-tool) add_subdirectory(test) diff --git a/draw/CMakeLists.txt b/draw/CMakeLists.txt deleted file mode 100644 index a76cecbf..00000000 --- a/draw/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(self ${PROJECT_NAME}-draw) -file(GLOB sources "*.cpp" CONFIGURE_ARGS) -add_library(${self} STATIC "${sources}") -target_link_libraries(${self} PUBLIC - Magnum::GL - Magnum::Magnum - Magnum::Shaders - ${PROJECT_NAME} -) -if(FLOORMAT_PRECOMPILED-HEADERS) - target_precompile_headers(${self} PRIVATE precomp.hpp) -endif() diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 617c78aa..eba2e95b 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,7 +1,7 @@ set(self "${PROJECT_NAME}-main") file(GLOB sources "*.cpp" CONFIGURE_ARGS) -link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-draw) +link_libraries(${PROJECT_NAME}) link_libraries(Magnum::Sdl2Application Magnum::Trade) link_libraries(MagnumIntegration::ImGui) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13b7d1ca..fa5112aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ set(self ${PROJECT_NAME}) -file(GLOB sources "*.cpp" "../shaders/*.cpp" "../serialize/*.cpp" CONFIGURE_ARGS) +file(GLOB sources "*.cpp" "../shaders/*.cpp" "../serialize/*.cpp" "../draw/*.cpp" CONFIGURE_ARGS) add_library(${self} STATIC "${sources}") target_link_libraries( ${self} PUBLIC |