diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/genrevision/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 |
7 files changed, 13 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c5d639800f0..644377fe545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,11 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0005 OLD) # -# Override configuration-types - we don't use anything else than debug and release +# Override configuration-types # if(CMAKE_CONFIGURATION_TYPES) - set(CMAKE_CONFIGURATION_TYPES Release Debug) + set(CMAKE_CONFIGURATION_TYPES Release RelWitDebInfo Debug) set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Reset the configurations to what we need" FORCE) @@ -219,11 +219,6 @@ if( DEBUG ) add_definitions(-DTRINITY_DEBUG) if(CMAKE_COMPILER_IS_GNUCXX) add_definitions(-g) - elseif(MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zi") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") endif() else() message("* Build in debug-mode : No (default)") diff --git a/src/genrevision/CMakeLists.txt b/src/genrevision/CMakeLists.txt index 6a61d3433f8..5e8a002b25d 100644 --- a/src/genrevision/CMakeLists.txt +++ b/src/genrevision/CMakeLists.txt @@ -16,18 +16,15 @@ add_executable(genrev ) if( CMAKE_GENERATOR MATCHES "Visual Studio" ) - add_custom_target("revision.h" ALL - COMMAND "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/genrev" - ${CMAKE_SOURCE_DIR} + add_custom_command(TARGET genrev ALL + POST_BUILD + COMMAND ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/genrev ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - DEPENDS genrev ) else() - add_custom_target("revision.h" ALL - COMMAND "${CMAKE_BINARY_DIR}/src/genrevision/genrev" - ${CMAKE_SOURCE_DIR} + add_custom_command(TARGET genrev ALL + COMMAND ${CMAKE_BINARY_DIR}/src/genrevision/genrev ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - DEPENDS genrev ) endif() diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index f46da8e6478..9af38dd89f6 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -53,7 +53,7 @@ add_executable(authserver ${authserver_SRCS} ) -add_dependencies(authserver revision.h) +add_dependencies(authserver genrev) if( NOT WIN32 ) add_definitions(-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"') diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 9eaa359b6c2..5b67fabc510 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -192,7 +192,7 @@ include_directories( add_library(game STATIC ${game_STAT_SRCS}) -add_dependencies(game revision.h) +add_dependencies(game genrev) # Generate precompiled header if(PCH) diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 9f9f4d42b77..792f6c81bfe 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -139,6 +139,8 @@ include_directories( add_library(scripts STATIC ${scripts_STAT_SRCS}) +add_dependencies(scripts genrev) + # Generate precompiled header if(PCH) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 85d8c1a971b..eab3ebee95d 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -66,7 +66,7 @@ include_directories( add_library(shared STATIC ${shared_STAT_SRCS}) -add_dependencies(shared revision.h) +add_dependencies(shared genrev) if(WIN32) target_link_libraries(shared diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 26f6717af26..f32c574135b 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -135,7 +135,7 @@ if( NOT WIN32 ) add_definitions(-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"') endif() -add_dependencies(worldserver revision.h) +add_dependencies(worldserver genrev) if( UNIX ) set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}") |