diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 51 | ||||
| -rw-r--r-- | src/common/mmaps_common/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/common/network/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/server/bnetserver/CMakeLists.txt | 36 | ||||
| -rw-r--r-- | src/server/database/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/server/proto/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | src/tools/extractor_common/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/tools/vmap4_assembler/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/CMakeLists.txt | 16 |
15 files changed, 109 insertions, 261 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 4aef665cc6f..326a8883e4c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -8,10 +8,14 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( +GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) + +add_library(common) + +CollectAndAddSourceFiles( + common ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude + EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows ${CMAKE_CURRENT_SOURCE_DIR}/Platform ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders @@ -19,43 +23,20 @@ CollectSourceFiles( ${CMAKE_CURRENT_SOURCE_DIR}/network) if(WIN32) - CollectSourceFiles( + CollectAndAddSourceFiles( + common ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Windows - WINDOWS_DEBUGGING_SOURCES) - list(APPEND PRIVATE_SOURCES - ${WINDOWS_DEBUGGING_SOURCES}) - CollectSourceFiles( + BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + CollectAndAddSourceFiles( + common ${CMAKE_CURRENT_SOURCE_DIR}/Platform/Windows - WINDOWS_PLATFORM_SOURCES) - list(APPEND PRIVATE_SOURCES - ${WINDOWS_PLATFORM_SOURCES}) - unset(WINDOWS_DEBUGGING_SOURCES) - unset(WINDOWS_PLATFORM_SOURCES) + BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) endif() -if(USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h) -endif(USE_COREPCH) - -GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) - -add_library(common - ${PRIVATE_SOURCES} -) - -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders - ${CMAKE_CURRENT_SOURCE_DIR}/mmaps_common - ${CMAKE_CURRENT_SOURCE_DIR}/network) - target_include_directories(common PUBLIC # Provide the binary dir for all child targets ${CMAKE_BINARY_DIR} - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -98,12 +79,8 @@ endif() # Generate precompiled header if(USE_COREPCH) - add_cxx_pch(common ${PRIVATE_PCH_HEADER}) + add_cxx_pch(common PrecompiledHeaders/commonPCH.h) endif() -unset(PRIVATE_SOURCES) -unset(PRIVATE_PCH_HEADER) -unset(PUBLIC_INCLUDES) - add_subdirectory(mmaps_common) add_subdirectory(network) diff --git a/src/common/mmaps_common/CMakeLists.txt b/src/common/mmaps_common/CMakeLists.txt index 2a65e8d5963..a6a27095a39 100644 --- a/src/common/mmaps_common/CMakeLists.txt +++ b/src/common/mmaps_common/CMakeLists.txt @@ -8,18 +8,13 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES -) +add_library(mmaps_common) -add_library(mmaps_common ${PRIVATE_SOURCES}) +CollectAndAddSourceFiles( + mmaps_common + ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(mmaps_common PRIVATE @@ -29,10 +24,6 @@ target_link_libraries(mmaps_common Recast Detour) -target_include_directories(mmaps_common - PUBLIC - ${PUBLIC_INCLUDES}) - set_target_properties(mmaps_common PROPERTIES COMPILE_WARNING_AS_ERROR ${WITH_WARNINGS_AS_ERRORS} diff --git a/src/common/network/CMakeLists.txt b/src/common/network/CMakeLists.txt index d1e900680d4..9f30b3c841c 100644 --- a/src/common/network/CMakeLists.txt +++ b/src/common/network/CMakeLists.txt @@ -8,22 +8,17 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(network - ${PRIVATE_SOURCES}) +add_library(network) -CollectIncludeDirectories( +CollectAndAddSourceFiles( + network ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES) + EXCLUDE + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_include_directories(network - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt index efe4c61fe74..1eaa80a3cd2 100644 --- a/src/server/bnetserver/CMakeLists.txt +++ b/src/server/bnetserver/CMakeLists.txt @@ -10,29 +10,21 @@ ########### bnetserver ############### -CollectSourceFiles( +GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) + +add_executable(bnetserver) + +CollectAndAddSourceFiles( + bnetserver ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude + EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) if (WIN32) if (MSVC) - list(APPEND PRIVATE_SOURCES bnetserver.rc) + target_sources(bnetserver PRIVATE bnetserver.rc) endif() -endif() - -if (USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/bnetPCH.h) -endif() - -GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) - -add_executable(bnetserver - ${PRIVATE_SOURCES} -) - -if (NOT WIN32) +else() target_compile_definitions(bnetserver PRIVATE _TRINITY_BNET_CONFIG="${CONF_DIR}/bnetserver.conf" _TRINITY_BNET_CONFIG_DIR="${CONF_DIR}/bnetserver.conf.d" @@ -45,15 +37,7 @@ target_link_libraries(bnetserver PUBLIC shared) -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}) @@ -92,5 +76,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(bnetserver ${PRIVATE_PCH_HEADER}) + add_cxx_pch(bnetserver PrecompiledHeaders/bnetPCH.h) endif() diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index 9b9dc97ca2c..0513064236b 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -8,31 +8,17 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - -if(USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/databasePCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(database - ${PRIVATE_SOURCES} -) +add_library(database) -CollectIncludeDirectories( +CollectAndAddSourceFiles( + database ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES - # Exclude + EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_include_directories(database - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -63,5 +49,5 @@ endif() # Generate precompiled header if(USE_COREPCH) - add_cxx_pch(database ${PRIVATE_PCH_HEADER}) + add_cxx_pch(database PrecompiledHeaders/databasePCH.h) endif() diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 8ebf8075eeb..ab35bd74d94 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -8,22 +8,12 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - -if(USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/gamePCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) CollectIncludeDirectories( ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC_INCLUDES - # Exclude + EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) # Provide an interface target for the game project to allow @@ -39,8 +29,13 @@ target_link_libraries(game-interface shared mmaps_common) -add_library(game - ${PRIVATE_SOURCES}) +add_library(game) + +CollectAndAddSourceFiles( + game + ${CMAKE_CURRENT_SOURCE_DIR} + EXCLUDE + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_include_directories(game PRIVATE @@ -73,5 +68,5 @@ endif() # Generate precompiled header if(USE_COREPCH) - add_cxx_pch(game ${PRIVATE_PCH_HEADER}) + add_cxx_pch(game PrecompiledHeaders/gamePCH.h) endif() diff --git a/src/server/proto/CMakeLists.txt b/src/server/proto/CMakeLists.txt index 517b34f448e..c308f5009f6 100644 --- a/src/server/proto/CMakeLists.txt +++ b/src/server/proto/CMakeLists.txt @@ -8,33 +8,17 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - -if (USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/protoPCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(proto - ${PRIVATE_SOURCES} -) +add_library(proto) -CollectIncludeDirectories( +CollectAndAddSourceFiles( + proto ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders - ${CMAKE_CURRENT_SOURCE_DIR}/Client/api - ${CMAKE_CURRENT_SOURCE_DIR}/Client/global_extensions) + EXCLUDE + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_include_directories(proto - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -66,5 +50,5 @@ endif() # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(proto ${PRIVATE_PCH_HEADER}) + add_cxx_pch(proto PrecompiledHeaders/protoPCH.h) endif() diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index fb4ba169b4c..06eb5060341 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -88,13 +88,10 @@ foreach(GRAPH_KEY ${GRAPH_KEYS}) message(" |") endforeach() -# Base sources which are used by every script project -if(USE_SCRIPTPCH) - set(PRIVATE_PCH_HEADER ScriptPCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) +add_library(scripts STATIC) + # Configures the scriptloader with the given name and stores the output in the LOADER_OUT variable. # It is possible to expose multiple subdirectories from the same scriptloader through passing # it to the variable arguments @@ -145,32 +142,28 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) # Add the module name to STATIC_SCRIPT_MODULES list(APPEND STATIC_SCRIPT_MODULES ${SCRIPT_MODULE}) # Add the module content to the whole static module - CollectSourceFiles(${SCRIPT_MODULE_PATH} PRIVATE_SOURCES) + CollectAndAddSourceFiles(scripts ${SCRIPT_MODULE_PATH}) endif() elseif(${SCRIPT_MODULE_VARIABLE} STREQUAL "dynamic") # Generate an own dynamic module which is loadable on runtime - # Add the module content to the whole static module - unset(SCRIPT_MODULE_PRIVATE_SOURCES) - CollectSourceFiles(${SCRIPT_MODULE_PATH} SCRIPT_MODULE_PRIVATE_SOURCES) # Configure the scriptloader ConfigureScriptLoader(${SCRIPT_MODULE} SCRIPT_MODULE_PRIVATE_SCRIPTLOADER ON ${SCRIPT_MODULE}) GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME) # Add the module name to DYNAMIC_SCRIPT_MODULES list(APPEND DYNAMIC_SCRIPT_MODULE_PROJECTS ${SCRIPT_MODULE_PROJECT_NAME}) # Create the script module project - add_library(${SCRIPT_MODULE_PROJECT_NAME} SHARED - ${SCRIPT_MODULE_PRIVATE_SOURCES} - ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}) + add_library(${SCRIPT_MODULE_PROJECT_NAME} SHARED) + CollectAndAddSourceFiles(${SCRIPT_MODULE_PROJECT_NAME} ${SCRIPT_MODULE_PATH}) + target_sources(${SCRIPT_MODULE_PROJECT_NAME} + PUBLIC + FILE_SET HEADERS FILES ScriptLoader.h) + target_link_libraries(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE trinity-core-interface PUBLIC game) - target_include_directories(${SCRIPT_MODULE_PROJECT_NAME} - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} PROPERTIES COMPILE_WARNING_AS_ERROR ${WITH_WARNINGS_AS_ERRORS} @@ -203,10 +196,13 @@ set(WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES ${DYNAMIC_SCRIPT_MODULE_PROJ ConfigureScriptLoader("static" SCRIPT_MODULE_PRIVATE_SCRIPTLOADER OFF ${STATIC_SCRIPT_MODULES}) -add_library(scripts STATIC - ScriptLoader.h - ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER} - ${PRIVATE_SOURCES}) +target_sources(scripts + PRIVATE + ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER}) + +target_sources(scripts + PUBLIC + FILE_SET HEADERS FILES ScriptLoader.h) target_link_libraries(scripts PRIVATE @@ -214,10 +210,6 @@ target_link_libraries(scripts PUBLIC game-interface) -target_include_directories(scripts - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(scripts PROPERTIES COMPILE_WARNING_AS_ERROR ${WITH_WARNINGS_AS_ERRORS} @@ -225,7 +217,7 @@ set_target_properties(scripts # Generate precompiled header if(USE_SCRIPTPCH) - add_cxx_pch("scripts" ${PRIVATE_PCH_HEADER} ${DYNAMIC_SCRIPT_MODULE_PROJECTS}) + add_cxx_pch("scripts" ScriptPCH.h ${DYNAMIC_SCRIPT_MODULE_PROJECTS}) reuse_cxx_pch("${DYNAMIC_SCRIPT_MODULE_PROJECTS}" scripts) endif() diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index cac46028064..37f12cfeb93 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -8,31 +8,17 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - -if(USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/sharedPCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(shared - ${PRIVATE_SOURCES} -) +add_library(shared) -CollectIncludeDirectories( +CollectAndAddSourceFiles( + shared ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES - # Exclude + EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_include_directories(shared - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -66,5 +52,5 @@ endif() # Generate precompiled header if(USE_COREPCH) - add_cxx_pch(shared ${PRIVATE_PCH_HEADER}) + add_cxx_pch(shared PrecompiledHeaders/sharedPCH.h) endif() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index bc0ed4e3656..55d300f2df3 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -8,29 +8,23 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - -if(WIN32) - if(MSVC) - list(APPEND PRIVATE_SOURCES worldserver.rc) - endif() -endif() - -if(USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h) -endif() - GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) add_executable(worldserver ${PRIVATE_SOURCES} ) -if(NOT WIN32) +CollectAndAddSourceFiles( + worldserver + ${CMAKE_CURRENT_SOURCE_DIR} + EXCLUDE + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) + +if(WIN32) + if(MSVC) + target_sources(worldserver PRIVATE worldserver.rc) + endif() +else() target_compile_definitions(worldserver PRIVATE _TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf" _TRINITY_CORE_CONFIG_DIR="${CONF_DIR}/worldserver.conf.d" @@ -46,15 +40,7 @@ target_link_libraries(worldserver readline gsoap) -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES - # Exclude - ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) - target_include_directories(worldserver - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -90,5 +76,5 @@ endif() # Generate precompiled header if(USE_COREPCH) - add_cxx_pch(worldserver ${PRIVATE_PCH_HEADER}) + add_cxx_pch(worldserver PrecompiledHeaders/worldPCH.h) endif() diff --git a/src/tools/extractor_common/CMakeLists.txt b/src/tools/extractor_common/CMakeLists.txt index cded754666d..490baa86714 100644 --- a/src/tools/extractor_common/CMakeLists.txt +++ b/src/tools/extractor_common/CMakeLists.txt @@ -8,11 +8,11 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) +add_library(extractor_common STATIC) -add_library(extractor_common STATIC ${PRIVATE_SOURCES}) +CollectAndAddSourceFiles( + extractor_common + ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(extractor_common PRIVATE @@ -22,10 +22,6 @@ target_link_libraries(extractor_common common network) -target_include_directories(extractor_common - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(extractor_common PROPERTIES COMPILE_WARNING_AS_ERROR ${WITH_WARNINGS_AS_ERRORS} diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 25f981063cc..af215c9995f 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -8,18 +8,11 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) +add_executable(mapextractor) -add_executable(mapextractor - ${PRIVATE_SOURCES} -) - -target_include_directories(mapextractor - PUBLIC - ${CMAKE_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/loadlib) +CollectAndAddSourceFiles( + mapextractor + ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(mapextractor PRIVATE @@ -27,13 +20,7 @@ target_link_libraries(mapextractor PUBLIC extractor_common) -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES) - target_include_directories(mapextractor - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index 10c26c81f69..92474f59dd7 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -8,11 +8,11 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) +add_executable(mmaps_generator) -add_executable(mmaps_generator ${PRIVATE_SOURCES}) +CollectAndAddSourceFiles( + mmaps_generator + ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(mmaps_generator PRIVATE @@ -20,13 +20,7 @@ target_link_libraries(mmaps_generator extractor_common mmaps_common) -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES) - target_include_directories(mmaps_generator - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt index 53ee1de0b8d..8f790e3a673 100644 --- a/src/tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -8,12 +8,11 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -set(PRIVATE_SOURCES - TileAssembler.cpp - TileAssembler.h - VMapAssembler.cpp) +add_executable(vmap4assembler) -add_executable(vmap4assembler ${PRIVATE_SOURCES}) +CollectAndAddSourceFiles( + vmap4assembler + ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(vmap4assembler PRIVATE diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt index c53e39fe423..2892c598ee6 100644 --- a/src/tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -8,11 +8,13 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -CollectSourceFiles( - ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE_SOURCES) +add_executable(vmap4extractor) -add_executable(vmap4extractor ${PRIVATE_SOURCES}) +CollectAndAddSourceFiles( + vmap4extractor + ${CMAKE_CURRENT_SOURCE_DIR} + EXCLUDE + ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) target_link_libraries(vmap4extractor PRIVATE @@ -20,13 +22,7 @@ target_link_libraries(vmap4extractor PUBLIC extractor_common) -CollectIncludeDirectories( - ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC_INCLUDES) - target_include_directories(vmap4extractor - PUBLIC - ${PUBLIC_INCLUDES} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) |