diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/server/database/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tools/vmap4_assembler/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/CMakeLists.txt | 6 |
10 files changed, 65 insertions, 65 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7dfb21bc82d..0fc7d1d5b47 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -23,9 +23,9 @@ list(APPEND PRIVATE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Errors.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Errors.h) -if (USE_COREPCH) +if(USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h) -endif (USE_COREPCH) +endif(USE_COREPCH) GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -82,12 +82,12 @@ set_target_properties(common FOLDER "server") -if( BUILD_SHARED_LIBS ) - if( UNIX ) +if(BUILD_SHARED_LIBS) + if(UNIX) install(TARGETS common LIBRARY DESTINATION lib) - elseif( WIN32 ) + elseif(WIN32) install(TARGETS common RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") @@ -95,6 +95,6 @@ if( BUILD_SHARED_LIBS ) endif() # Generate precompiled header -if (USE_COREPCH) +if(USE_COREPCH) add_cxx_pch(common ${PRIVATE_PCH_HEADER}) -endif () +endif() diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt index 9b6e0ee634f..b652e7f3ffc 100644 --- a/src/server/database/CMakeLists.txt +++ b/src/server/database/CMakeLists.txt @@ -14,7 +14,7 @@ CollectSourceFiles( # Exclude ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -if (USE_COREPCH) +if(USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/databasePCH.h) endif() @@ -59,12 +59,12 @@ set_target_properties(database FOLDER "server") -if( BUILD_SHARED_LIBS ) - if( UNIX ) +if(BUILD_SHARED_LIBS) + if(UNIX) install(TARGETS database LIBRARY DESTINATION lib) - elseif( WIN32 ) + elseif(WIN32) install(TARGETS database RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") @@ -72,6 +72,6 @@ if( BUILD_SHARED_LIBS ) endif() # Generate precompiled header -if (USE_COREPCH) +if(USE_COREPCH) add_cxx_pch(database ${PRIVATE_PCH_HEADER}) -endif () +endif() diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 58170d200bf..53971feebfe 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -14,9 +14,9 @@ CollectSourceFiles( # Exclude ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -if (USE_COREPCH) +if(USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/gamePCH.h) -endif () +endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -60,12 +60,12 @@ set_target_properties(game FOLDER "server") -if( BUILD_SHARED_LIBS ) - if( UNIX ) +if(BUILD_SHARED_LIBS) + if(UNIX) install(TARGETS game LIBRARY DESTINATION lib) - elseif( WIN32 ) + elseif(WIN32) install(TARGETS game RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") @@ -73,6 +73,6 @@ if( BUILD_SHARED_LIBS ) endif() # Generate precompiled header -if (USE_COREPCH) +if(USE_COREPCH) add_cxx_pch(game ${PRIVATE_PCH_HEADER}) -endif () +endif() diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 2235423a76e..319aafaec9b 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -20,7 +20,7 @@ GetInstallOffset(INSTALL_OFFSET) # when using predefined templates for script building # like dynamic, static, minimal-static... # Sets SCRIPTS_DEFAULT_LINKAGE -if (SCRIPTS MATCHES "dynamic") +if(SCRIPTS MATCHES "dynamic") set(SCRIPTS_DEFAULT_LINKAGE "dynamic") elseif(SCRIPTS MATCHES "static") set(SCRIPTS_DEFAULT_LINKAGE "static") @@ -29,7 +29,7 @@ else() endif() # Sets SCRIPTS_USE_WHITELIST # Sets SCRIPTS_WHITELIST -if (SCRIPTS MATCHES "minimal") +if(SCRIPTS MATCHES "minimal") set(SCRIPTS_USE_WHITELIST ON) # Whitelist which is used when minimal is selected list(APPEND SCRIPTS_WHITELIST Commands Spells) @@ -39,10 +39,10 @@ endif() # variables set above foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) ScriptModuleNameToVariable(${SCRIPT_MODULE} SCRIPT_MODULE_VARIABLE) - if (${SCRIPT_MODULE_VARIABLE} STREQUAL "default") + if(${SCRIPT_MODULE_VARIABLE} STREQUAL "default") if(SCRIPTS_USE_WHITELIST) list(FIND SCRIPTS_WHITELIST "${SCRIPT_MODULE}" INDEX) - if (${INDEX} GREATER -1) + if(${INDEX} GREATER -1) set(${SCRIPT_MODULE_VARIABLE} ${SCRIPTS_DEFAULT_LINKAGE}) else() set(${SCRIPT_MODULE_VARIABLE} "disabled") @@ -52,7 +52,7 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) endif() endif() # Build the Graph values - if (${SCRIPT_MODULE_VARIABLE} MATCHES "dynamic") + if(${SCRIPT_MODULE_VARIABLE} MATCHES "dynamic") GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME) GetNativeSharedLibraryName(${SCRIPT_MODULE_PROJECT_NAME} SCRIPT_PROJECT_LIBRARY) list(APPEND GRAPH_KEYS ${SCRIPT_MODULE_PROJECT_NAME}) @@ -77,7 +77,7 @@ message("* Script configuration (${SCRIPTS}): |") foreach(GRAPH_KEY ${GRAPH_KEYS}) - if (NOT GRAPH_KEY STREQUAL "disabled") + if(NOT GRAPH_KEY STREQUAL "disabled") message(" +- ${GRAPH_VALUE_DISPLAY_${GRAPH_KEY}}") else() message(" | ${GRAPH_VALUE_DISPLAY_${GRAPH_KEY}}") @@ -89,9 +89,9 @@ foreach(GRAPH_KEY ${GRAPH_KEYS}) endforeach() # Base sources which are used by every script project -if (USE_SCRIPTPCH) +if(USE_SCRIPTPCH) set(PRIVATE_PCH_HEADER ScriptPCH.h) -endif () +endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) @@ -135,13 +135,13 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) GetPathToScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PATH) ScriptModuleNameToVariable(${SCRIPT_MODULE} SCRIPT_MODULE_VARIABLE) - if ((${SCRIPT_MODULE_VARIABLE} STREQUAL "disabled") OR + if((${SCRIPT_MODULE_VARIABLE} STREQUAL "disabled") OR (${SCRIPT_MODULE_VARIABLE} STREQUAL "static")) # Uninstall disabled modules GetProjectNameOfScriptModule(${SCRIPT_MODULE} SCRIPT_MODULE_PROJECT_NAME) GetNativeSharedLibraryName(${SCRIPT_MODULE_PROJECT_NAME} SCRIPT_MODULE_OUTPUT_NAME) list(APPEND DISABLED_SCRIPT_MODULE_PROJECTS ${INSTALL_OFFSET}/${SCRIPT_MODULE_OUTPUT_NAME}) - if (${SCRIPT_MODULE_VARIABLE} STREQUAL "static") + if(${SCRIPT_MODULE_VARIABLE} STREQUAL "static") # Add the module name to STATIC_SCRIPT_MODULES list(APPEND STATIC_SCRIPT_MODULES ${SCRIPT_MODULE}) # Add the module content to the whole static module @@ -224,17 +224,17 @@ set_target_properties(scripts "scripts") # Generate precompiled header -if (USE_SCRIPTPCH) +if(USE_SCRIPTPCH) list(APPEND ALL_SCRIPT_PROJECTS scripts ${DYNAMIC_SCRIPT_MODULE_PROJECTS}) add_cxx_pch("${ALL_SCRIPT_PROJECTS}" ${PRIVATE_PCH_HEADER}) endif() # Remove all shared libraries in the installl directory which # are contained in the static library already. -if (DISABLED_SCRIPT_MODULE_PROJECTS) +if(DISABLED_SCRIPT_MODULE_PROJECTS) install(CODE " foreach(SCRIPT_TO_UNINSTALL ${DISABLED_SCRIPT_MODULE_PROJECTS}) - if (EXISTS \"\${SCRIPT_TO_UNINSTALL}\") + if(EXISTS \"\${SCRIPT_TO_UNINSTALL}\") message(STATUS \"Uninstalling: \${SCRIPT_TO_UNINSTALL}\") file(REMOVE \"\${SCRIPT_TO_UNINSTALL}\") endif() diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 642ebe9b4b7..0e820d731c8 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -14,7 +14,7 @@ CollectSourceFiles( # Exclude ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -if (USE_COREPCH) +if(USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/sharedPCH.h) endif() @@ -54,12 +54,12 @@ set_target_properties(shared FOLDER "server") -if( BUILD_SHARED_LIBS ) - if( UNIX ) +if(BUILD_SHARED_LIBS) + if(UNIX) install(TARGETS shared LIBRARY DESTINATION lib) - elseif( WIN32 ) + elseif(WIN32) install(TARGETS shared RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") @@ -67,6 +67,6 @@ if( BUILD_SHARED_LIBS ) endif() # Generate precompiled header -if (USE_COREPCH) +if(USE_COREPCH) add_cxx_pch(shared ${PRIVATE_PCH_HEADER}) -endif () +endif() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index a07087056a0..ef83ddb5b6d 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -14,14 +14,14 @@ CollectSourceFiles( # Exclude ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -if( WIN32 ) +if(WIN32) list(APPEND PRIVATE_SOURCES ${sources_windows}) - if ( MSVC ) + if(MSVC) list(APPEND PRIVATE_SOURCES worldserver.rc) endif() endif() -if (USE_COREPCH) +if(USE_COREPCH) set(PRIVATE_PCH_HEADER PrecompiledHeaders/worldPCH.h) endif() @@ -31,13 +31,13 @@ add_executable(worldserver ${PRIVATE_SOURCES} ) -if( NOT WIN32 ) +if(NOT WIN32) set_target_properties(worldserver PROPERTIES COMPILE_DEFINITIONS _TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf" ) endif() -if( UNIX AND NOT NOJEM AND NOT APPLE ) +if(UNIX AND NOT NOJEM AND NOT APPLE) set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}") endif() @@ -69,17 +69,17 @@ set_target_properties(worldserver "server") # Add all dynamic projects as dependency to the worldserver -if (WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES) +if(WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES) add_dependencies(worldserver ${WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES}) endif() -if( COPY_CONF AND WIN32 ) - if ( "${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild" ) +if(COPY_CONF AND WIN32) + if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild") add_custom_command(TARGET worldserver POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ ) - elseif ( MINGW ) + elseif(MINGW) add_custom_command(TARGET worldserver POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/ @@ -87,19 +87,19 @@ if( COPY_CONF AND WIN32 ) endif() endif() -if( UNIX ) +if(UNIX) install(TARGETS worldserver DESTINATION bin) - if( COPY_CONF ) + if(COPY_CONF) install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR}) endif() -elseif( WIN32 ) +elseif(WIN32) install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}") - if( COPY_CONF ) + if(COPY_CONF) install(FILES worldserver.conf.dist DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() endif() # Generate precompiled header -if( USE_COREPCH ) +if(USE_COREPCH) add_cxx_pch(worldserver ${PRIVATE_PCH_HEADER}) endif() diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 218f5f99fab..c61f0250613 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -12,7 +12,7 @@ CollectSourceFiles( ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE_SOURCES) -if (WIN32) +if(WIN32) list(APPEND PRIVATE_SOURCES ${sources_windows}) endif() @@ -46,8 +46,8 @@ set_target_properties(mapextractor FOLDER "tools") -if( UNIX ) +if(UNIX) install(TARGETS mapextractor DESTINATION bin) -elseif( WIN32 ) +elseif(WIN32) install(TARGETS mapextractor DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index f91d881132d..ce9d005a9c2 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -12,7 +12,7 @@ CollectSourceFiles( ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE_SOURCES) -if (WIN32) +if(WIN32) list(APPEND PRIVATE_SOURCES ${sources_windows}) endif() @@ -43,8 +43,8 @@ set_target_properties(mmaps_generator FOLDER "tools") -if( UNIX ) +if(UNIX) install(TARGETS mmaps_generator DESTINATION bin) -elseif( WIN32 ) +elseif(WIN32) install(TARGETS mmaps_generator DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt index 803fd35b188..17b49590883 100644 --- a/src/tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -13,7 +13,7 @@ set(PRIVATE_SOURCES TileAssembler.h VMapAssembler.cpp) -if (WIN32) +if(WIN32) list(APPEND PRIVATE_SOURCES ${sources_windows}) endif() @@ -32,8 +32,8 @@ set_target_properties(vmap4assembler FOLDER "tools") -if( UNIX ) +if(UNIX) install(TARGETS vmap4assembler DESTINATION bin) -elseif( WIN32 ) +elseif(WIN32) install(TARGETS vmap4assembler DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt index 0f3e23714f1..1bf2764f2fb 100644 --- a/src/tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -12,7 +12,7 @@ CollectSourceFiles( ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE_SOURCES) -if (WIN32) +if(WIN32) list(APPEND PRIVATE_SOURCES ${sources_windows}) endif() @@ -39,8 +39,8 @@ set_target_properties(vmap4extractor FOLDER "tools") -if( UNIX ) +if(UNIX) install(TARGETS vmap4extractor DESTINATION bin) -elseif( WIN32 ) +elseif(WIN32) install(TARGETS vmap4extractor DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() |