generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to run the test suite when built as part of LLVM.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@191930 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne 2013-10-03 21:58:25 +00:00
parent f7eb5738f6
commit 4c81b00f75
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -26,6 +26,10 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there." build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there."
) )
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(LIBCXX_BUILT_STANDALONE 1)
endif()
#=============================================================================== #===============================================================================
# Setup CMake Options # Setup CMake Options
#=============================================================================== #===============================================================================

11
test/CMakeLists.txt
View File

@ -8,7 +8,12 @@ endmacro()
include(FindPythonInterp) include(FindPythonInterp)
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
set(LIT_EXECUTABLE "" CACHE FILEPATH "Path to LLVM's lit.py.") if(LIBCXX_BUILT_STANDALONE)
set(LIT_EXECUTABLE "" CACHE FILEPATH "Path to LLVM's lit.py.")
else()
set(LIT_EXECUTABLE "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")
endif()
set(LIT_ARGS_DEFAULT "-sv") set(LIT_ARGS_DEFAULT "-sv")
if (MSVC OR XCODE) if (MSVC OR XCODE)
set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar") set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
@ -19,7 +24,7 @@ if(PYTHONINTERP_FOUND)
separate_arguments(LIT_ARGS) separate_arguments(LIT_ARGS)
set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER})
set(LIBCXX_SOURCE_DIR ${CMAKE_SOURCE_DIR}) set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(LIBCXX_BINARY_DIR ${CMAKE_BINARY_DIR}) set(LIBCXX_BINARY_DIR ${CMAKE_BINARY_DIR})
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
pythonize_bool(LIBCXX_ENABLE_SHARED) pythonize_bool(LIBCXX_ENABLE_SHARED)
@ -37,7 +42,7 @@ if(PYTHONINTERP_FOUND)
${LIT_EXECUTABLE} ${LIT_EXECUTABLE}
${LIT_ARGS} ${LIT_ARGS}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS DEPENDS cxx
COMMENT "Running libcxx tests") COMMENT "Running libcxx tests")
else() else()
message(WARNING "Could not find Python, no check target will be available!") message(WARNING "Could not find Python, no check target will be available!")