From 0738e76381e2170eded398af0034103be8ecc927 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 2 Nov 2011 17:54:51 +0000 Subject: tests: Clean up tests/CMakeLists.txt to drop some variable configuration we no longer need substitutions for. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143555 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CMakeLists.txt | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'test/CMakeLists.txt') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7bb1bdd..f6bd051 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,41 +29,6 @@ if(PYTHONINTERP_FOUND) set(LIT_ARGS "${LLVM_LIT_ARGS}") separate_arguments(LIT_ARGS) - get_directory_property(DEFINITIONS COMPILE_DEFINITIONS) - foreach(DEF ${DEFINITIONS}) - set(DEFS "${DEFS} -D${DEF}") - endforeach() - get_directory_property(INC_DIRS INCLUDE_DIRECTORIES) - foreach(INC_DIR ${INC_DIRS}) - set(IDIRS "${IDIRS} -I${INC_DIR}") - endforeach() - - if( MSVC ) - # The compiler's path may contain white space. Wrap it: - string(REPLACE "" "\\\"${CMAKE_CXX_COMPILER}\\\"" TEST_COMPILE_CXX_CMD ${CMAKE_CXX_COMPILE_OBJECT}) - # Eliminate continuation lines from NMake flow. PR9680 - string(REPLACE "@<<\n" " " TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - string(REPLACE "\n<<" " " TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - else() - string(REPLACE "" "${CMAKE_CXX_COMPILER}" TEST_COMPILE_CXX_CMD ${CMAKE_CXX_COMPILE_OBJECT}) - endif() - - string(REPLACE "" "${DEFS}" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - string(REPLACE "" "${CMAKE_CXX_FLAGS}" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - if (MSVC) # PR9680 - # Eliminate MSVC equivalent of -o - string(REPLACE "/Fo" "" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - # Eliminate "how to rename program database" argument - string(REPLACE "/Fd" "" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - else() - string(REPLACE "-o" "" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - endif(MSVC) - string(REGEX REPLACE "<[^>]+>" "" TEST_COMPILE_CXX_CMD ${TEST_COMPILE_CXX_CMD}) - set(TEST_COMPILE_CXX_CMD "${TEST_COMPILE_CXX_CMD} ${IDIRS}") - if(NOT MSVC) - set(TEST_COMPILE_CXX_CMD "${TEST_COMPILE_CXX_CMD} -x c++") - # MSVC already has /TP to indicate a C++ source file - endif() configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/site.exp.in ${CMAKE_CURRENT_BINARY_DIR}/site.exp) @@ -76,7 +41,6 @@ if(PYTHONINTERP_FOUND) 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") - set(LLVMGCCDIR "") set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED}) set(SHLIBPATH_VAR ${SHLIBPATH_VAR}) -- cgit v1.1