summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-01-13 16:12:49 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-01-13 16:12:49 +0000
commitdebb79b9943495f3d56404f99e8c33d0e97a3766 (patch)
treea93e2347d79ac80147680210c01cde7e3fc7e871
parent2e06b93f43f79f018d10b982980199ca526d2739 (diff)
downloadbcm5719-llvm-debb79b9943495f3d56404f99e8c33d0e97a3766.tar.gz
bcm5719-llvm-debb79b9943495f3d56404f99e8c33d0e97a3766.zip
Sink {config.h,ConfigureChecks}.cmake into cmake directory.
llvm-svn: 93318
-rw-r--r--compiler-rt/CMakeLists.txt7
-rw-r--r--compiler-rt/cmake/ConfigureChecks.cmake (renamed from compiler-rt/ConfigureChecks.cmake)0
-rw-r--r--compiler-rt/cmake/config.h.cmake (renamed from compiler-rt/config.h.cmake)0
3 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index a57d6a98667..483b673773a 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -19,8 +19,9 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
"${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there."
)
-INCLUDE( ConfigureChecks.cmake )
-CONFIGURE_FILE( config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/ConfigureChecks.cmake )
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/config.h.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h )
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
@@ -46,7 +47,7 @@ IF( BUILD_BLOCKS_RUNTIME )
ELSE( BUILD_BLOCKS_RUNTIME )
MESSAGE(STATUS "No suitable atomic operation routines detected, skipping Blocks Runtime")
ENDIF( BUILD_BLOCKS_RUNTIME )
-
+
ADD_SUBDIRECTORY( lib )
# Enable Test Suit:
diff --git a/compiler-rt/ConfigureChecks.cmake b/compiler-rt/cmake/ConfigureChecks.cmake
index b72a390af8c..b72a390af8c 100644
--- a/compiler-rt/ConfigureChecks.cmake
+++ b/compiler-rt/cmake/ConfigureChecks.cmake
diff --git a/compiler-rt/config.h.cmake b/compiler-rt/cmake/config.h.cmake
index 307e277872a..307e277872a 100644
--- a/compiler-rt/config.h.cmake
+++ b/compiler-rt/cmake/config.h.cmake
OpenPOWER on IntegriCloud