From 74009be05158c72893e02c2930b771a334543f1b Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Tue, 11 Aug 2015 18:17:41 +0000 Subject: [PATCH] Re-apply "cmake: Make CMAKE_BUILD_TYPE check case-insensitive" This re-applies r244516 (effectively reverting r244516) without losing the check that caused failures for VS. llvm-svn: 244643 --- llvm/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index adf852e..9943115 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -7,11 +7,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(CMAKE_BUILD_TYPE "Debug") endif() -if (CMAKE_BUILD_TYPE AND - NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$") - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -endif() - if(POLICY CMP0022) cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required endif() @@ -157,6 +152,11 @@ endif() string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) +if (CMAKE_BUILD_TYPE AND + NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") + message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +endif() + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) # They are used as destination of target generators. -- 2.7.4