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.
This commit is contained in:
parent
0ce03f5395
commit
65b5219fd5
2 changed files with 4 additions and 4 deletions
|
@ -25,8 +25,8 @@ set(BUILD_STATIC ON CACHE BOOL "" FORCE)
|
||||||
set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
|
set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
|
||||||
set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
|
set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
|
set(WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE)
|
set(WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
|
set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_MAIN ON CACHE BOOL "" FORCE)
|
set(WITH_MAIN ON CACHE BOOL "" FORCE)
|
||||||
add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
|
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_MESHTOOLS OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
|
set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_SCENEGRAPH 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_SHADERS ON CACHE BOOL "" FORCE)
|
||||||
set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
|
set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
|
||||||
set(WITH_TEXT OFF CACHE BOOL "" FORCE)
|
set(WITH_TEXT OFF CACHE BOOL "" FORCE)
|
||||||
|
|
|
@ -20,7 +20,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
set(SAVETOOL_PROJECT_VERSION 1.3.2)
|
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(Magnum REQUIRED GL Sdl2Application)
|
||||||
find_package(MagnumIntegration REQUIRED ImGui)
|
find_package(MagnumIntegration REQUIRED ImGui)
|
||||||
|
|
||||||
|
@ -186,7 +186,6 @@ endif()
|
||||||
target_link_libraries(MassBuilderSaveTool PRIVATE
|
target_link_libraries(MassBuilderSaveTool PRIVATE
|
||||||
Corrade::Containers
|
Corrade::Containers
|
||||||
Corrade::Utility
|
Corrade::Utility
|
||||||
Corrade::Interconnect
|
|
||||||
Corrade::Main
|
Corrade::Main
|
||||||
Magnum::Magnum
|
Magnum::Magnum
|
||||||
Magnum::GL
|
Magnum::GL
|
||||||
|
|
Loading…
Reference in a new issue