feat(Cmake): Rewrite build and use inherited dependencies (#1652)

2026-01-18 03:15:41 +00:00 · 2019-04-02 03:41:08 +07:00
parent 0f174eff01
commit eae9affec9
48 changed files with 6336 additions and 1178 deletions
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -9,35 +9,41 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-file(GLOB_RECURSE sources *.cpp *.h)
-
-set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/src/common/Utilities
-    ${CMAKE_SOURCE_DIR}/src/common
-    ${CMAKE_SOURCE_DIR}/deps/libmpq
-    ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
-)
-
-if( WIN32 )
-  set(include_Dirs
-    ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
-  )
-endif()
-
-include_directories(${include_Dirs})
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES)

 add_executable(mapextractor
-  ${sources}
+  ${PRIVATE_SOURCES}
 )
+ 
+target_include_directories(mapextractor
+  PUBLIC
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/loadlib)

 target_link_libraries(mapextractor
-  mpq
-  ${BZIP2_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-)
+  PUBLIC
+    shared
+    mpq)
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+target_include_directories(mapextractor
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(mapextractor
+  PROPERTIES
+    FOLDER
+      "tools")

 if( UNIX )
  install(TARGETS mapextractor DESTINATION bin)
--- a/src/tools/mesh_extractor/CMakeLists.txt
+++ b/src/tools/mesh_extractor/CMakeLists.txt
@@ -9,39 +9,35 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
-
-set(include_Base
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/common
-  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${ACE_INCLUDE_DIR}
+CollectSourceFiles(
  ${CMAKE_CURRENT_SOURCE_DIR}
-)
+  PRIVATE_SOURCES)

-if( WIN32 )
-  set(include_Base
-    ${include_Base}
-    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
-    )
-endif()
-
-include_directories(${include_Base})
-
-add_executable(MeshExtractor ${meshExtract_Sources})
+add_executable(MeshExtractor ${PRIVATE_SOURCES})

 target_link_libraries(MeshExtractor
-  g3dlib
-  mpq
-  Recast
-  Detour
-  ${BZIP2_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${ACE_LIBRARY}
-)
+  PUBLIC
+    shared
+    Recast
+    mpq)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES)
+
+target_include_directories(MeshExtractor
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(MeshExtractor
+  PROPERTIES
+    FOLDER
+      "tools")

 if( UNIX )
  install(TARGETS MeshExtractor DESTINATION bin)
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -8,130 +8,36 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-file(GLOB_RECURSE mmap_gen_sources *.cpp *.h)
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES)

-set(mmap_gen_Includes
-  ${CMAKE_BINARY_DIR}
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/deps/zlib
-  ${CMAKE_SOURCE_DIR}/deps/bzip2
-  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
-  ${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/Database
-  ${CMAKE_SOURCE_DIR}/src/common/DataStores
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/common/Logging
-  ${CMAKE_SOURCE_DIR}/src/common/Packets
-  ${CMAKE_SOURCE_DIR}/src/common/Threading
-  ${CMAKE_SOURCE_DIR}/src/common/Utilities
-  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
-  ${CMAKE_SOURCE_DIR}/src/server/game
-  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
-  ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
-  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/server/game/Events
-  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/server/game/Pools
-  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/src/server/game/Quests
-  ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/server/game/Server
-  ${CMAKE_SOURCE_DIR}/src/server/game/Skills
-  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
-  ${CMAKE_SOURCE_DIR}/src/server/game/Tools
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden
-  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/server/game/World
-)
-
-if( WIN32 )
-  set(mmap_gen_Includes
-    ${mmap_gen_Includes}
-    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
-    )
-endif()
-
-include_directories(${mmap_gen_Includes})
-
-add_executable(mmaps_generator ${mmap_gen_sources})
+add_executable(mmaps_generator ${PRIVATE_SOURCES})

 target_link_libraries(mmaps_generator
-  shared
-  collision
-  g3dlib
-  Recast
-  Detour
-  ${ACE_LIBRARY}
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${BZIP2_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-)
+  PUBLIC
+    shared
+    Recast
+    mpq)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES)
+
+target_include_directories(mmaps_generator
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/src/server/game/Conditions)
+
+set_target_properties(mmaps_generator
+  PROPERTIES
+    FOLDER
+      "tools")

 if( UNIX )
  install(TARGETS mmaps_generator DESTINATION bin)
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -9,17 +9,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-include_directories(
-  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/src/common
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
-  ${ACE_INCLUDE_DIR}
-  ${ZLIB_INCLUDE_DIR}
-)
-
 add_executable(vmap4assembler VMapAssembler.cpp)

 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -27,10 +16,16 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()

 target_link_libraries(vmap4assembler
-  collision
-  g3dlib
-  ${ZLIB_LIBRARIES}
-)
+  shared
+  zlib)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})  
+
+set_target_properties(vmap4assembler
+  PROPERTIES
+    FOLDER
+      "tools")

 if( UNIX )
  install(TARGETS vmap4assembler DESTINATION bin)
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -9,28 +9,33 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-file(GLOB_RECURSE sources *.cpp *.h)
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES)

-set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/deps/libmpq
-)
-
-if( WIN32 )
-  set(include_Dirs
-    ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
-  )
-endif()
-
-include_directories(${include_Dirs})
-
-add_executable(vmap4extractor ${sources})
+add_executable(vmap4extractor ${PRIVATE_SOURCES})

 target_link_libraries(vmap4extractor
-  mpq
-  ${BZIP2_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-)
+  PUBLIC
+    mpq)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES)
+
+target_include_directories(vmap4extractor
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+set_target_properties(vmap4extractor
+  PROPERTIES
+    FOLDER
+      "tools")

 if( UNIX )
  install(TARGETS vmap4extractor DESTINATION bin)