[llvm] r191624 - Enable libcxx as part of the top level CMake build when it is checked

Chandler Carruth chandlerc at gmail.com
Sat Sep 28 11:17:10 PDT 2013


Author: chandlerc
Date: Sat Sep 28 13:17:10 2013
New Revision: 191624

URL: http://llvm.org/viewvc/llvm-project?rev=191624&view=rev
Log:
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.

Modified:
    llvm/trunk/projects/CMakeLists.txt

Modified: llvm/trunk/projects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/CMakeLists.txt?rev=191624&r1=191623&r2=191624&view=diff
==============================================================================
--- llvm/trunk/projects/CMakeLists.txt (original)
+++ llvm/trunk/projects/CMakeLists.txt Sat Sep 28 13:17:10 2013
@@ -11,9 +11,10 @@ foreach(entry ${entries})
   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})
+  add_llvm_external_project(libcxx)
   if(${CMAKE_VERSION} VERSION_GREATER 2.8.7)
     add_llvm_external_project(compiler-rt)
   else()





More information about the llvm-commits mailing list