aboutsummaryrefslogtreecommitdiff
path: root/cmake/compiler
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-05 17:55:32 +0200
committerShauren <shauren.trinity@gmail.com>2016-04-05 22:43:41 +0200
commit4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502 (patch)
tree4d75c3393ff1707ec5a2793590f2496be8373a22 /cmake/compiler
parent792299bbd544a44911e463383be567d7738412a5 (diff)
Buildsystem: Initial changes to support building with vs clang toolset
Diffstat (limited to 'cmake/compiler')
-rw-r--r--cmake/compiler/msvc/settings.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
index 86470f327c5..dd5b9a0b28b 100644
--- a/cmake/compiler/msvc/settings.cmake
+++ b/cmake/compiler/msvc/settings.cmake
@@ -31,7 +31,11 @@ else()
endif()
# Set build-directive (used in core to tell which buildtype we used)
-add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\")
+if(CMAKE_MAKE_PROGRAM MATCHES "nmake")
+ add_definitions(-D_BUILD_DIRECTIVE=\\"${CMAKE_BUILD_TYPE}\\")
+else()
+ add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\")
+endif()
# multithreaded compiling on VS
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")