summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2016-02-17 16:38:54 +0000
committerChris Bieneman <beanz@apple.com>2016-02-17 16:38:54 +0000
commit0a83a9d06ca14155ed96a4da99af1a4a571d9d76 (patch)
treede313923ca49ab01f182f974345fabcc3a356a02
parent0ab085c67585346958e8f1d3a3413c543b0196ba (diff)
[CMake] Push the dependency on AddLLVM into the test and unites layers
Compiler-rt only relies on LLVM for lit support. Pushing this dependency down into the test and unitest layers will allow builtin libraries to be built without LLVM. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@261105 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--cmake/Modules/AddCompilerRT.cmake1
-rw-r--r--test/CMakeLists.txt3
-rw-r--r--unittests/CMakeLists.txt3
3 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
index c55f9e4a1..b64a61805 100644
--- a/cmake/Modules/AddCompilerRT.cmake
+++ b/cmake/Modules/AddCompilerRT.cmake
@@ -1,4 +1,3 @@
-include(AddLLVM)
include(ExternalProject)
include(CompilerRTUtils)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fe2ff49b1..f986ec151 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Needed for lit support
+include(AddLLVM)
+
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index fe2c39781..e5059bd91 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Needed for lit support
+include(AddLLVM)
+
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)