diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-11-06 23:37:22 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-11-06 23:37:22 +0000 |
| commit | 2b379460510523e0a05b3558523dcc50e976b916 (patch) | |
| tree | 4ff111b1a3c7d48cc78abdf05ac8d038379734d0 /cmake/modules | |
| parent | c8eb880a7fb0958a3a048a82c8558beec11f1209 (diff) | |
| download | external_llvm-2b379460510523e0a05b3558523dcc50e976b916.zip external_llvm-2b379460510523e0a05b3558523dcc50e976b916.tar.gz external_llvm-2b379460510523e0a05b3558523dcc50e976b916.tar.bz2 | |
Fix CRT selection logic when using CMake NMake generator.
CMAKE_CONFIGURATION_TYPES is only set on Visual Studio generators. For NMake CMAKE_BUILD_TYPE is used instead.
Patch by EJose Fonseca!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143898 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/ChooseMSVCCRT.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/ChooseMSVCCRT.cmake b/cmake/modules/ChooseMSVCCRT.cmake index eb78f45..6a2f426 100644 --- a/cmake/modules/ChooseMSVCCRT.cmake +++ b/cmake/modules/ChooseMSVCCRT.cmake @@ -60,7 +60,7 @@ variables (LLVM_USE_CRT_DEBUG, etc) instead.") make_crt_regex(MSVC_CRT_REGEX ${MSVC_CRT}) - foreach(build_type ${CMAKE_CONFIGURATION_TYPES}) + foreach(build_type ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE}) string(TOUPPER "${build_type}" build) if (NOT LLVM_USE_CRT_${build}) get_current_crt(LLVM_USE_CRT_${build} @@ -75,7 +75,7 @@ variables (LLVM_USE_CRT_DEBUG, etc) instead.") endif(NOT LLVM_USE_CRT_${build}) endforeach(build_type) - foreach(build_type ${CMAKE_CONFIGURATION_TYPES}) + foreach(build_type ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE}) string(TOUPPER "${build_type}" build) if ("${LLVM_USE_CRT_${build}}" STREQUAL "") set(flag_string " ") |