From 61ef177d485cb6ddd27305ea3f7915e771c4307d Mon Sep 17 00:00:00 2001 From: Koncord Date: Tue, 14 Jan 2020 15:49:28 +0800 Subject: [PATCH] Build debug, debugging and debuglog for all targets The server will require SDL2 --- CMakeLists.txt | 2 +- components/CMakeLists.txt | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cd567a67..a7e6f1abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,6 +269,7 @@ endif() if(BUILD_OPENMW OR BUILD_OPENCS OR BUILD_OPENMW_MP) find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow) include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS}) + find_package(SDL2 REQUIRED) endif() IF(BUILD_OPENMW OR BUILD_OPENCS) @@ -316,7 +317,6 @@ IF(BUILD_OPENMW OR BUILD_OPENCS) endif() find_package(MyGUI 3.2.2 REQUIRED) - find_package(SDL2 REQUIRED) find_package(OpenAL REQUIRED) find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath) ELSE() diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index da22066ba..d540b135c 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -91,11 +91,10 @@ add_component_dir (misc gcd constants utf8stream stringops resourcehelpers rng messageformatparser weakcache ) -if (BUILD_OPENMW OR BUILD_OPENCS) - add_component_dir(debug - debugging debuglog - ) -endif () +add_component_dir(debug + debugging debuglog + ) + IF(NOT WIN32 AND NOT APPLE) add_definitions(-DGLOBAL_DATA_PATH="${GLOBAL_DATA_PATH}")