diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-05 17:55:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-09 12:38:20 +0200 |
| commit | 702cfefddbc1a8a83e113cec44ee09ecc9daf6db (patch) | |
| tree | 86ad39f4569dfaed2b123f7d18ddfc0bbd126625 /cmake/compiler | |
| parent | 25b3564a9d2c9205ff3712488b0d48dc3c09cc4f (diff) | |
Buildsystem: Initial changes to support building with vs clang toolset
(cherry picked from commit 4a3a178d7fe9d2d7e8fde2fe915cf5cec5223502)
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
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") |