Rewritten cmakes allowing compilation with new structure

This commit is contained in:
Yehonal
2016-08-11 20:07:14 +02:00
parent 0f85ce1c54
commit 80453e215e
36 changed files with 767 additions and 856 deletions
@@ -12,8 +12,8 @@
file(GLOB_RECURSE sources *.cpp *.h)
set(include_Dirs
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/modules/dep/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/loadlib
)
@@ -21,7 +21,7 @@ set(include_Dirs
if( WIN32 )
set(include_Dirs
${include_Dirs}
${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
)
endif()
@@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
set(include_Base
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/dep/libmpq
${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${ACE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
@@ -25,7 +25,7 @@ set(include_Base
if( WIN32 )
set(include_Base
${include_Base}
${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
)
endif()
@@ -15,29 +15,29 @@ set(mmap_gen_Includes
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/modules/dep/libmpq
${CMAKE_SOURCE_DIR}/modules/dep/zlib
${CMAKE_SOURCE_DIR}/modules/dep/bzip2
${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/src/server/collision
${CMAKE_SOURCE_DIR}/src/server/collision/Management
${CMAKE_SOURCE_DIR}/src/server/collision/Maps
${CMAKE_SOURCE_DIR}/src/server/collision/Models
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/src/server/shared/Database
${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic/LinkedReference
${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
${CMAKE_SOURCE_DIR}/src/server/shared/Logging
${CMAKE_SOURCE_DIR}/src/server/shared/Packets
${CMAKE_SOURCE_DIR}/src/server/shared/Threading
${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
${CMAKE_SOURCE_DIR}/src/server/game
${CMAKE_SOURCE_DIR}/src/server/game/Accounts
${CMAKE_SOURCE_DIR}/src/server/game/Achievements
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
if( WIN32 )
set(mmap_gen_Includes
${mmap_gen_Includes}
${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
)
endif()
@@ -10,12 +10,12 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
include_directories(
${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
${CMAKE_SOURCE_DIR}/src/server/collision
${CMAKE_SOURCE_DIR}/src/server/collision/Maps
${CMAKE_SOURCE_DIR}/src/server/collision/Models
${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
${CMAKE_SOURCE_DIR}/modules/acore/framework
${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
${ACE_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
)
@@ -12,13 +12,13 @@
file(GLOB_RECURSE sources *.cpp *.h)
set(include_Dirs
${CMAKE_SOURCE_DIR}/modules/dep/libmpq
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
)
if( WIN32 )
set(include_Dirs
${include_Dirs}
${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
)
endif()