CMake: Use inherited dependencies in database, shared and game

(cherry picked from commit 469f2d3ade168de0b5be18112008c337067a8e03)

1 files changed, 32 insertions, 41 deletions

diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt
index f4f160fe1ca..6d75ba963e7 100644
--- a/src/server/database/CMakeLists.txt
+++ b/src/server/database/CMakeLists.txt
@@ -8,30 +8,22 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-if( USE_COREPCH )
-  include_directories(${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h)
-file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging/*.h)
-file(GLOB_RECURSE sources_Updater Updater/*.cpp Updater/*.h)
-
-file(GLOB sources_localdir *.cpp *.h)
-
-#
-# Build shared sourcelist
-#
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 if (USE_COREPCH)
-  set(database_STAT_PCH_HDR PrecompiledHeaders/databasePCH.h)
-  set(database_STAT_PCH_SRC PrecompiledHeaders/databasePCH.cpp)
+  set(PRIVATE_PCH_HEADER PrecompiledHeaders/databasePCH.h)
+  set(PRIVATE_PCH_SOURCE PrecompiledHeaders/databasePCH.cpp)
 endif()
 
-set(database_STAT_SRCS
-  ${database_STAT_SRCS}
-  ${sources_Database}
-  ${sources_Logging}
-  ${sources_Updater}
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(database
+  ${PRIVATE_SOURCES}
+  ${PRIVATE_PCH_SOURCE}
 )
 
 # Do NOT add any extra include directory unless it does not create unneeded extra dependencies,
@@ -43,31 +35,30 @@ set(database_STAT_SRCS
 # linkage (enums, defines...) it is discouraged to do so unless necessary, as it will pullute
 # include_directories leading to further unnoticed dependency aditions
 # Linker Depencency requirements: common
-include_directories(
+CollectIncludeDirectories(
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/Database
-  ${CMAKE_CURRENT_SOURCE_DIR}/Updater
-  ${CMAKE_SOURCE_DIR}/dep/cppformat
-  ${CMAKE_SOURCE_DIR}/dep/process
-  ${CMAKE_SOURCE_DIR}/src/common/
-  ${CMAKE_SOURCE_DIR}/src/common/Configuration
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Logging
-  ${CMAKE_SOURCE_DIR}/src/common/Threading
-  ${CMAKE_SOURCE_DIR}/src/common/Utilities
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-  ${VALGRIND_INCLUDE_DIR}
-)
+  PUBLIC_INCLUDES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
-GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(database
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(database STATIC
-  ${database_STAT_SRCS}
-  ${database_STAT_PCH_SRC}
-)
+target_link_libraries(database
+  PUBLIC
+    common
+    process
+    mysql)
+
+set_target_properties(database
+    PROPERTIES
+      FOLDER
+        "server")
 
 # Generate precompiled header
 if (USE_COREPCH)
-  add_cxx_pch(database ${database_STAT_PCH_HDR} ${database_STAT_PCH_SRC})
+  add_cxx_pch(database ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE})
 endif ()