[llvm-commits] [llvm] r133205 - in /llvm/trunk: cmake/modules/HandleLLVMOptions.cmake test/CMakeLists.txt

[Andrew Trick]

Author: atrick
Date: Thu Jun 16 17:19:20 2011
New Revision: 133205

URL: http://llvm.org/viewvc/llvm-project?rev=133205&view=rev
Log:
Added LLVM_BUILD_MODE to cmake so that lit supports tests with REQUIRES: {buildmode}.

Modified:
    llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
    llvm/trunk/test/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=133205&r1=133204&r2=133205&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Thu Jun 16 17:19:20 2011
@@ -36,8 +36,13 @@
   # explicitly undefine it:
   if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
     add_definitions( -UNDEBUG )
+    set(LLVM_BUILD_MODE "Release")
+  else()
+    set(LLVM_BUILD_MODE "Debug")
   endif()
+  set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}+Asserts")
 else()
+  set(LLVM_BUILD_MODE "Release")
   if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" )
     if( NOT MSVC_IDE AND NOT XCODE )
       add_definitions( -DNDEBUG )

Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=133205&r1=133204&r2=133205&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Thu Jun 16 17:19:20 2011
@@ -71,7 +71,7 @@
   MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/Unit)
 
   # Configuration-time: See Unit/lit.site.cfg.in
-  set(LLVM_BUILD_MODE "%(build_mode)s")
+  set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}")
 
   set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
   set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})