endif()
endforeach(entry)
-# Also add in the compiler-rt tree if present and we have a sufficiently
-# recent version of CMake.
-if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND
- ${LLVM_BUILD_RUNTIME} AND
- IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt AND
- EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/CMakeLists.txt)
- add_subdirectory(compiler-rt)
+# 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})
+ # MSVC isn't quite working with libc++ yet, disable it until issues are
+ # fixed.
+ if(NOT MSVC)
+ add_llvm_external_project(libcxx)
+ endif()
+ 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()