From 702cfefddbc1a8a83e113cec44ee09ecc9daf6db Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Apr 2016 17:55:32 +0200 Subject: Buildsystem: Initial changes to support building with vs clang toolset (cherry picked from commit 4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502) --- cmake/compiler/msvc/settings.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmake/compiler/msvc/settings.cmake') diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index c2eda80512b..f9a89f72076 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") -- cgit v1.2.3