[llvm] r244643 - Re-apply "cmake: Make CMAKE_BUILD_TYPE check case-insensitive"
Justin Bogner via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 11 11:17:41 PDT 2015
Author: bogner
Date: Tue Aug 11 13:17:41 2015
New Revision: 244643
URL: http://llvm.org/viewvc/llvm-project?rev=244643&view=rev
Log:
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.
Modified:
llvm/trunk/CMakeLists.txt
Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=244643&r1=244642&r2=244643&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Tue Aug 11 13:17:41 2015
@@ -7,11 +7,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C
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.
More information about the llvm-commits
mailing list