From: Andrew Trick Date: Wed, 22 Jun 2011 05:43:36 +0000 (+0000) Subject: Only do config-time substitution of LLVM_BUILD_MODE in X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4383c282af954e4f65ae3b77c891fa41a4960a2a;p=oota-llvm.git Only do config-time substitution of LLVM_BUILD_MODE in test/lit.site.cfg, not Unit/test/lit.site.cfg. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133608 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 82eac606427..2db58b9dcc5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -71,8 +71,6 @@ if(PYTHONINTERP_FOUND) MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/Unit) # Configuration-time: See Unit/lit.site.cfg.in - set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}") - set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR}) set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR}) set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s") @@ -81,10 +79,17 @@ if(PYTHONINTERP_FOUND) set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED}) set(SHLIBPATH_VAR ${SHLIBPATH_VAR}) + # 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 @ONLY) + + # 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