diff options
author | Naios <naios-dev@live.de> | 2017-12-19 17:22:30 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2017-12-21 23:31:11 +0100 |
commit | 85e460802d0867634003768d7b8be356d236aba3 (patch) | |
tree | a113c27193d0e982f93ad9740d1e950d0fdb0306 | |
parent | 9d0400211def5b56b33f966707ab764597470c83 (diff) |
Build: Inherit the features and warning flags privately
(cherry picked from commit 12853475186569b2f47f1d69f817cbef8e590d83)
-rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/server/authserver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/server/database/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/server/game/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/server/scripts/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/server/shared/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/mmaps_generator/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/vmap4_assembler/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/tools/vmap4_extractor/CMakeLists.txt | 7 |
11 files changed, 31 insertions, 8 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7440cc2d51e..938cde8160a 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -61,8 +61,8 @@ target_include_directories(common target_link_libraries(common PRIVATE process - PUBLIC trinity-core-interface + PUBLIC boost fmt g3dlib diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 5a9ad7c8314..d68a0f8d813 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -40,6 +40,8 @@ if( NOT WIN32 ) endif() target_link_libraries(authserver + PRIVATE + trinity-core-interface PUBLIC shared) diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index bcba7ead06c..e016a274588 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -48,6 +48,8 @@ target_include_directories(database add_definitions(-DTRINITY_API_EXPORT_DATABASE) target_link_libraries(database + PRIVATE + trinity-core-interface PUBLIC common mysql) diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 901cd75a56a..d39c13f2fbd 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -49,10 +49,11 @@ target_include_directories(game ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(game - PUBLIC - game-interface PRIVATE - efsw) + trinity-core-interface + efsw + PUBLIC + game-interface) set_target_properties(game PROPERTIES diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index fdb19bfb440..134cd478656 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -162,6 +162,8 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) ${SCRIPT_MODULE_PRIVATE_SOURCES} ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}) target_link_libraries(${SCRIPT_MODULE_PROJECT_NAME} + PRIVATE + trinity-core-interface PUBLIC game) set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} @@ -202,6 +204,8 @@ add_library(scripts STATIC ${PRIVATE_SOURCES}) target_link_libraries(scripts + PRIVATE + trinity-core-interface PUBLIC game-interface) diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 400899ca749..1c813299831 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -40,6 +40,8 @@ target_include_directories(shared ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(shared + PRIVATE + trinity-core-interface PUBLIC database) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index da3847cd566..8f5b6e1f0e8 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -44,6 +44,8 @@ endif() set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}") target_link_libraries(worldserver + PRIVATE + trinity-core-interface PUBLIC scripts game diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 87ad3ff5089..4a10a9d1f94 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -27,6 +27,8 @@ target_include_directories(mapextractor ${CMAKE_CURRENT_SOURCE_DIR}/loadlib) target_link_libraries(mapextractor + PRIVATE + trinity-core-interface PUBLIC common mpq) diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index 593a6737210..e8da2e04f0b 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -19,6 +19,8 @@ endif() add_executable(mmaps_generator ${PRIVATE_SOURCES}) target_link_libraries(mmaps_generator + PRIVATE + trinity-core-interface PUBLIC common Recast diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt index 520c07793fb..7ac00bdb069 100644 --- a/src/tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -22,8 +22,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") endif() target_link_libraries(vmap4assembler - common - zlib) + PRIVATE + trinity-core-interface + PUBLIC + common + zlib) set_target_properties(vmap4assembler PROPERTIES diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt index 42bff330d0b..738cf86ac1b 100644 --- a/src/tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -20,8 +20,11 @@ endif() add_executable(vmap4extractor ${PRIVATE_SOURCES}) target_link_libraries(vmap4extractor - common - mpq) + PRIVATE + trinity-core-interface + PUBLIC + common + mpq) set_target_properties(vmap4extractor PROPERTIES |