From 012d681acddb8385e0076fabd5fa125e6250456c Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sun, 6 Nov 2011 23:37:22 +0000 Subject: 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! llvm-svn: 143898 --- llvm/cmake/modules/ChooseMSVCCRT.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/cmake/modules/ChooseMSVCCRT.cmake') diff --git a/llvm/cmake/modules/ChooseMSVCCRT.cmake b/llvm/cmake/modules/ChooseMSVCCRT.cmake index eb78f45c885..6a2f426b269 100644 --- a/llvm/cmake/modules/ChooseMSVCCRT.cmake +++ b/llvm/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 " ") -- cgit v1.2.3