[cfe-commits] r133609 - /cfe/trunk/test/CMakeLists.txt

[Andrew Trick]

Author: atrick
Date: Wed Jun 22 00:44:01 2011
New Revision: 133609

URL: http://llvm.org/viewvc/llvm-project?rev=133609&view=rev
Log:
Only do config-time substitution of LLVM_BUILD_MODE in
test/lit.site.cfg, not Unit/test/lit.site.cfg.

Modified:
    cfe/trunk/test/CMakeLists.txt

Modified: cfe/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=133609&r1=133608&r2=133609&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/trunk/test/CMakeLists.txt Wed Jun 22 00:44:01 2011
@@ -28,7 +28,6 @@
 
 set(LLVM_SOURCE_DIR "${LLVM_MAIN_SRC_DIR}")
 set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}")
-set(LLVM_BUILD_MODE "%(build_mode)s")
 set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s")
 set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/%(build_config)s")
 set(CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
@@ -39,10 +38,16 @@
   set(ENABLE_SHARED 0)
 endif(BUILD_SHARED_LIBS)
 
+# lit.site.cfg uses the config-time build mode
+set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}")
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 
+# Unit/lit.site.cfg substitutes the runtime build_mode
+set(LLVM_BUILD_MODE "%(build_mode)s")
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg