CMake: Use inherited dependencies in worldserver and authserver

* Closes #1679

(cherry picked from commit 03d249f0631c3561070ebbdd7301115507c68876)

1 files changed, 35 insertions, 74 deletions

diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
index 3cc1d20cf5e..81aabc3eed8 100644
--- a/src/server/bnetserver/CMakeLists.txt
+++ b/src/server/bnetserver/CMakeLists.txt
@@ -10,76 +10,29 @@
 
 ########### bnetserver ###############
 
-file(GLOB_RECURSE sources_authentication Authentication/*.cpp Authentication/*.h)
-file(GLOB_RECURSE sources_realms Realms/*.cpp Realms/*.h)
-file(GLOB_RECURSE sources_server Server/*.cpp Server/*.h)
-file(GLOB_RECURSE sources_packets Packets/*.cpp Packets/*.h)
-file(GLOB sources_localdir *.cpp *.h)
-
-if (USE_COREPCH)
-  set(bnetserver_PCH_HDR PrecompiledHeaders/bnetPCH.h)
-  set(bnetserver_PCH_SRC PrecompiledHeaders/bnetPCH.cpp)
-endif()
-
-set(bnetserver_SRCS
-  ${bnetserver_SRCS}
-  ${sources_authentication}
-  ${sources_realms}
-  ${sources_server}
-  ${sources_packets}
-  ${sources_localdir}
-)
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 if( WIN32 )
-  set(bnetserver_SRCS
-    ${bnetserver_SRCS}
-    ${sources_windows}
-  )
+  list(APPEND PRIVATE_SOURCES ${sources_windows})
   if ( MSVC )
-    set(bnetserver_SRCS
-      ${bnetserver_SRCS}
-      bnetserver.rc
-    )
-  endif ()
+    list(APPEND PRIVATE_SOURCES bnetserver.rc)
+  endif()
 endif()
 
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/Authentication
-  ${CMAKE_CURRENT_SOURCE_DIR}/Packets
-  ${CMAKE_CURRENT_SOURCE_DIR}/Realms
-  ${CMAKE_CURRENT_SOURCE_DIR}/Server
-  ${CMAKE_SOURCE_DIR}/dep/cppformat
-  ${CMAKE_SOURCE_DIR}/dep/zmqpp
-  ${CMAKE_SOURCE_DIR}/src/common
-  ${CMAKE_SOURCE_DIR}/src/common/Configuration
-  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Logging
-  ${CMAKE_SOURCE_DIR}/src/common/Threading
-  ${CMAKE_SOURCE_DIR}/src/common/Utilities
-  ${CMAKE_SOURCE_DIR}/src/common/Platform
-  ${CMAKE_SOURCE_DIR}/src/server/database
-  ${CMAKE_SOURCE_DIR}/src/server/database/Database
-  ${CMAKE_SOURCE_DIR}/src/server/database/Logging
-  ${CMAKE_SOURCE_DIR}/src/server/database/Updater
-  ${CMAKE_SOURCE_DIR}/src/server/ipc
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Networking
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Packets
-  ${CMAKE_SOURCE_DIR}/src/server/shared/Service
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-  ${VALGRIND_INCLUDE_DIR}
-  ${ZMQ_INCLUDE_DIR}
-)
+if (USE_COREPCH)
+  set(PRIVATE_PCH_HEADER PrecompiledHeaders/bnetPCH.h)
+  set(PRIVATE_PCH_SOURCE PrecompiledHeaders/bnetPCH.cpp)
+endif()
 
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(bnetserver
-  ${bnetserver_SRCS}
-  ${bnetserver_PCH_SRC}
+  ${PRIVATE_SOURCES}
+  ${PRIVATE_PCH_SOURCE}
 )
 
 if( NOT WIN32 )
@@ -89,18 +42,26 @@ if( NOT WIN32 )
 endif()
 
 target_link_libraries(bnetserver
-  shared
-  database
-  ipc
-  common
-  zmqpp
-  cppformat
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${ZMQ_LIBRARY}
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${Boost_LIBRARIES}
-)
+  PUBLIC
+    shared
+    ipc)
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
+
+target_include_directories(bnetserver
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(bnetserver
+    PROPERTIES
+      FOLDER
+        "server")
 
 if( WIN32 )
   if ( MSVC )
@@ -126,5 +87,5 @@ endif()
 
 # Generate precompiled header
 if (USE_COREPCH)
-  add_cxx_pch(bnetserver ${bnetserver_PCH_HDR} ${bnetserver_PCH_SRC})
+  add_cxx_pch(bnetserver ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE})
 endif()