diff options
| author | click <click@gonnamakeyou.com> | 2013-01-29 23:18:25 +0100 |
|---|---|---|
| committer | click <click@gonnamakeyou.com> | 2013-01-29 23:18:25 +0100 |
| commit | ea9c6524dd4209c0074faecdf48d53b006fe6f5d (patch) | |
| tree | 604553900539e0c3a6c6b0497066bd1178ea6b66 | |
| parent | 76910472d824a409adefc774604653e78c7d1041 (diff) | |
Buildsystem/CMake: Revoke commit 7b49da48f9c3c21406fbe350de170757ea6e285f - it creates unwanted results when used with PCh on *nix platforms.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/compiler/clang/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/gcc/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/icc/settings.cmake | 2 | ||||
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b57ec9adda4..7b075b6ede3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0005 NEW) +cmake_policy(SET CMP0005 OLD) # add this options before PROJECT keyword set(CMAKE_DISABLE_SOURCE_CHANGES ON) diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index e48e00ae78e..ae07b1fc39b 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="$(CONFIGURATION)") +add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"') if(WITH_WARNINGS) set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors") diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index 9438662bee9..25ee96c8562 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index 58eb63b081d..133bc15e59e 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +add_definitions(-D_BUILD_DIRECTIVE="'${CMAKE_BUILD_TYPE}'") if(PLATFORM EQUAL 32) add_definitions(-axSSE2) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 3ede406a4a4..d758d466407 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -25,7 +25,7 @@ else() endif() # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="$(ConfigurationName)") +add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\") # multithreaded compiling on VS set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") |