diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-09 00:37:41 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-09 00:37:41 +0200 |
| commit | 509a27fd51a2f88c5c72c264d2a546229c9c0e00 (patch) | |
| tree | cbc44cfeab8c1459e013a4b2a6451667ed2e7a51 /cmake/compiler | |
| parent | 6b9d74ae63b1059bd7de9854acf2a225b743ed65 (diff) | |
Buildsystem: Improved logic for _BUILD_DIRECTIVE in msvc builds
Diffstat (limited to 'cmake/compiler')
| -rw-r--r-- | cmake/compiler/msvc/settings.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index dd5b9a0b28b..a20cb32221e 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -31,10 +31,12 @@ else() endif() # Set build-directive (used in core to tell which buildtype we used) -if(CMAKE_MAKE_PROGRAM MATCHES "nmake") - add_definitions(-D_BUILD_DIRECTIVE=\\"${CMAKE_BUILD_TYPE}\\") -else() +# msbuild/devenv don't set CMAKE_MAKE_PROGRAM, you can choose build type from a dropdown after generating projects +if("${CMAKE_MAKE_PROGRAM}" STREQUAL "") add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\") +else() + # while all make-like generators do (nmake, ninja) + add_definitions(-D_BUILD_DIRECTIVE=\\"${CMAKE_BUILD_TYPE}\\") endif() # multithreaded compiling on VS |