Enable libcxx as part of the top level CMake build when it is checked

out in projects. This appears to be working on my system, and I will be
watching build bots to see if there are any issues on other platforms.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191624 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index c19bb679d186e1a51cb9533547f1f8d66f407fe5..de06b78423c575d3cf2a05a9a21060ed5a32482b 100644 (file)
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -11,9 +11,10 @@ foreach(entry ${entries})
   endif()
 endforeach(entry)
 
   endif()
 endforeach(entry)
 

-# Also add in the compiler-rt tree if present and we have a sufficiently
-# recent version of CMake.
+# Also add in libc++ and compiler-rt trees if present (and we have
+# a sufficiently recent version of CMake where required).

 if(${LLVM_BUILD_RUNTIME})
 if(${LLVM_BUILD_RUNTIME})

+  add_llvm_external_project(libcxx)

   if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
     add_llvm_external_project(compiler-rt)
   else()
   if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
     add_llvm_external_project(compiler-rt)
   else()