From a58d0651cb490cbecf0f57cd7ca72d729a1e6eda Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Wed, 17 Feb 2016 16:38:54 +0000 Subject: [PATCH] [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. llvm-svn: 261105 --- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 1 - compiler-rt/test/CMakeLists.txt | 3 +++ compiler-rt/unittests/CMakeLists.txt | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index c55f9e4..b64a618 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -1,4 +1,3 @@ -include(AddLLVM) include(ExternalProject) include(CompilerRTUtils) diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index fe2ff49..f986ec1 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/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/compiler-rt/unittests/CMakeLists.txt b/compiler-rt/unittests/CMakeLists.txt index fe2c397..e5059bd 100644 --- a/compiler-rt/unittests/CMakeLists.txt +++ b/compiler-rt/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) -- 2.7.4