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

[oota-llvm.git] / projects / CMakeLists.txt

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 1a286db9ec660be163198b9536ec544727b4ce7d..de06b78423c575d3cf2a05a9a21060ed5a32482b 100644 (file)
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -4,8 +4,20 @@
 file(GLOB entries *)
 foreach(entry ${entries})
   if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt)
-    if(NOT (${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt))
+    if((NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) AND
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxx))
       add_subdirectory(${entry})
     endif()
   endif()
 endforeach(entry)
+
+# 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()
+    message(WARNING "Can't build compiler-rt, CMake 2.8.8 required!")
+  endif()
+endif()