[PATCH] D28392: [CMake][libcxx] Move Python check to main CMake file

[Petr Hosek via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL291592: [CMake][libcxx] Move Python check to main CMake file (authored by phosek).

Changed prior to commit:
  https://reviews.llvm.org/D28392?vs=83333&id=83845#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D28392

Files:
  libcxx/trunk/CMakeLists.txt
  libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake


Index: libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
===================================================================
--- libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
@@ -95,13 +95,6 @@
   endif()
 
   # 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)
     set(LLVM_INCLUDE_TESTS ${LLVM_FOUND})
   endif()
Index: libcxx/trunk/CMakeLists.txt
===================================================================
--- libcxx/trunk/CMakeLists.txt
+++ libcxx/trunk/CMakeLists.txt
@@ -32,6 +32,15 @@
   include(HandleOutOfTreeLLVM)
 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.
 include(MacroEnsureOutOfSourceBuild)
 MACRO_ENSURE_OUT_OF_SOURCE_BUILD(


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D28392.83845.patch
Type: text/x-patch
Size: 1281 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170110/3ece9799/attachment.bin>