LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[CMake][libcxx] Move Python check to main CMake file"

Browse Source 
This reverts commit 39441fe9f0.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291728 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Petr Hosek
2017-01-11 23:56:33 +00:00
parent b81ce92008
commit 0758410191
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -32,15 +32,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
include(HandleOutOfTreeLLVM) include(HandleOutOfTreeLLVM)
endif() endif()
if (LIBCXX_STANDALONE_BUILD)
include(FindPythonInterp)
if( NOT PYTHONINTERP_FOUND )
message(WARNING "Failed to find python interpreter. "
"The libc++ test suite will be disabled.")
set(LLVM_INCLUDE_TESTS OFF)
endif()
endif()
# Require out of source build. # Require out of source build.
include(MacroEnsureOutOfSourceBuild) include(MacroEnsureOutOfSourceBuild)
MACRO_ENSURE_OUT_OF_SOURCE_BUILD( MACRO_ENSURE_OUT_OF_SOURCE_BUILD(

7
cmake/Modules/HandleOutOfTreeLLVM.cmake
View File

@@ -95,6 +95,13 @@ macro(configure_out_of_tree_llvm)
endif() endif()
# LLVM Options -------------------------------------------------------------- # LLVM Options --------------------------------------------------------------
include(FindPythonInterp)
if( NOT PYTHONINTERP_FOUND )
message(WARNING "Failed to find python interpreter. "
"The libc++ test suite will be disabled.")
set(LLVM_INCLUDE_TESTS OFF)
endif()
if (NOT DEFINED LLVM_INCLUDE_TESTS) if (NOT DEFINED LLVM_INCLUDE_TESTS)
set(LLVM_INCLUDE_TESTS ${LLVM_FOUND}) set(LLVM_INCLUDE_TESTS ${LLVM_FOUND})
endif() endif()