From fdb39e1d1da177a85f6c9768662a12e79cd64d88 Mon Sep 17 00:00:00 2001 From: William JCM Date: Sun, 20 Jun 2021 23:56:46 +0200 Subject: [PATCH] CMakeLists: we won't need those libraries, in the end. The ImGui integration needs the Flat shader in Magnum::Shaders, so that one stays on. --- CMakeLists.txt | 8 ++++---- src/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0d0a34..b44bea4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,14 +52,14 @@ set(TARGET_VK OFF CACHE BOOL "" FORCE) set(WITH_AUDIO OFF CACHE BOOL "" FORCE) set(WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE) set(WITH_GL ON CACHE BOOL "" FORCE) -set(WITH_MESHTOOLS ON CACHE BOOL "" FORCE) -set(WITH_PRIMITIVES ON CACHE BOOL "" FORCE) -set(WITH_SCENEGRAPH 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_SHADERS ON CACHE BOOL "" FORCE) set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE) set(WITH_TEXT OFF CACHE BOOL "" FORCE) set(WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE) -set(WITH_TRADE ON CACHE BOOL "" FORCE) +set(WITH_TRADE OFF CACHE BOOL "" FORCE) set(WITH_VK OFF CACHE BOOL "" FORCE) set(WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE) add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f1cc1d..0ae4776 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) find_package(Corrade REQUIRED Main Containers Utility Interconnect) -find_package(Magnum REQUIRED GL Sdl2Application SceneGraph MeshTools Primitives) +find_package(Magnum REQUIRED GL Sdl2Application) find_package(MagnumIntegration REQUIRED ImGui) set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)