From 65b5219fd56dee83b2e787ad243280d2635afd8a Mon Sep 17 00:00:00 2001 From: William JCM Date: Sat, 16 Apr 2022 01:05:00 +0200 Subject: [PATCH] CMakeLists: do some dependency cleanup. I guess I initially planned to make the Save Tool use Interconnect, and there was a Magnum module that prevented me from disabling PluginManager. --- CMakeLists.txt | 5 +++-- src/CMakeLists.txt | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6ca5b1..63c4e3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ set(BUILD_STATIC ON CACHE BOOL "" FORCE) set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE) set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE) -set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE) -set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE) +set(WITH_INTERCONNECT OFF CACHE BOOL "" FORCE) +set(WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE) set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE) set(WITH_MAIN ON CACHE BOOL "" FORCE) add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL) @@ -56,6 +56,7 @@ set(WITH_GL ON CACHE BOOL "" FORCE) set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE) set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE) set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE) +set(WITH_SCENETOOLS OFF CACHE BOOL "" FORCE) set(WITH_SHADERS ON CACHE BOOL "" FORCE) set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE) set(WITH_TEXT OFF CACHE BOOL "" FORCE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41f836c..4ca5c39 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(SAVETOOL_PROJECT_VERSION 1.3.2) -find_package(Corrade REQUIRED Main Containers Utility Interconnect) +find_package(Corrade REQUIRED Main Containers Utility) find_package(Magnum REQUIRED GL Sdl2Application) find_package(MagnumIntegration REQUIRED ImGui) @@ -186,7 +186,6 @@ endif() target_link_libraries(MassBuilderSaveTool PRIVATE Corrade::Containers Corrade::Utility - Corrade::Interconnect Corrade::Main Magnum::Magnum Magnum::GL