diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-09 00:37:41 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-09 12:39:03 +0200 |
| commit | 43fb6b220919aa1587647c59249d36d1067e3c9b (patch) | |
| tree | 79d4835ba332eaf221ab546eac9ded64835926e9 /cmake/compiler/msvc/settings.cmake | |
| parent | 702cfefddbc1a8a83e113cec44ee09ecc9daf6db (diff) | |
Buildsystem: Improved logic for _BUILD_DIRECTIVE in msvc builds
(cherry picked from commit 509a27fd51a2f88c5c72c264d2a546229c9c0e00)
Diffstat (limited to 'cmake/compiler/msvc/settings.cmake')
| -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 f9a89f72076..336ed84c8ed 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}" MATCHES "MSBuild") 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 |