diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-07 06:35:29 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-07 06:35:29 +0100 |
| commit | fd9a69fcd6616b0bedbd1b30339b37becd21ba36 (patch) | |
| tree | 542005d15c87c8ab9d30562b34fe093c7f266131 | |
| parent | 9045f8cb38893d1bc75275e2773052f8e75af5c7 (diff) | |
cmake cruft
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | editor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c8fa04d..67f1741f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,12 +144,14 @@ include_directories(.) include_directories(src) get_property(_fm-sdl2-include-dirs TARGET SDL2::SDL2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +get_property(_fm-json-include-dirs TARGET nlohmann_json::nlohmann_json PROPERTY INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM "${CORRADE_INCLUDE_DIR}" "${MAGNUM_INCLUDE_DIR}" "${MAGNUMPLUGINS_INCLUDE_DIR}" "${MAGNUMINTEGRATION_INCLUDE_DIR}" "${_fm-sdl2-include-dirs}" + "${_fm-json-include-dirs}" ) add_subdirectory(src) diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 8e96f92b..0ce1773a 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -9,6 +9,8 @@ else() set_property(SOURCE "${res}" APPEND PROPERTY COMPILE_OPTIONS "-w") endif() +link_libraries(MagnumIntegration::ImGui) + add_executable(${self} "${sources}" "${res}" "../loader/loader-impl.cpp") target_link_libraries(${self} ${PROJECT_NAME}-main) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index aeab7d0b..fe774f8b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -27,7 +27,7 @@ else() -Wno-error -Wno-undef ) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-old-style-cast") endif() if(FLOORMAT_SUBMODULE-DEPENDENCIES) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index a2d71a61..66737793 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -3,7 +3,6 @@ file(GLOB sources "*.cpp" CONFIGURE_ARGS) link_libraries(${PROJECT_NAME}) link_libraries(Magnum::Sdl2Application Corrade::Containers Magnum::GL Magnum::Trade) -link_libraries(MagnumIntegration::ImGui) add_library(${self} STATIC "${sources}") |