[llvm-commits] [compiler-rt] r93318 - in /compiler-rt/trunk: CMakeLists.txt ConfigureChecks.cmake cmake/ConfigureChecks.cmake cmake/config.h.cmake config.h.cmake

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jan 13 10:12:49 2010
New Revision: 93318

URL: http://llvm.org/viewvc/llvm-project?rev=93318&view=rev
Log:
Sink {config.h,ConfigureChecks}.cmake into cmake directory.

Added:
    compiler-rt/trunk/cmake/ConfigureChecks.cmake
      - copied, changed from r86542, compiler-rt/trunk/ConfigureChecks.cmake
    compiler-rt/trunk/cmake/config.h.cmake
      - copied, changed from r86542, compiler-rt/trunk/config.h.cmake
Removed:
    compiler-rt/trunk/ConfigureChecks.cmake
    compiler-rt/trunk/config.h.cmake
Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=93318&r1=93317&r2=93318&view=diff

==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Wed Jan 13 10:12:49 2010
@@ -19,8 +19,9 @@
  "${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 @@
 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:

Removed: compiler-rt/trunk/ConfigureChecks.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/ConfigureChecks.cmake?rev=93317&view=auto

==============================================================================
--- compiler-rt/trunk/ConfigureChecks.cmake (original)
+++ compiler-rt/trunk/ConfigureChecks.cmake (removed)
@@ -1,38 +0,0 @@
-INCLUDE( CheckIncludeFile )
-INCLUDE( CheckFunctionExists )
-INCLUDE( CheckSymbolExists )
-INCLUDE( CheckCSourceCompiles )
-
-SET( PACKAGE ${PACKAGE_NAME} )
-SET( VERSION ${PACKAGE_VERSION} )
-
-SET( BINARYDIR ${CMAKE_BINARY_DIR} )
-SET( SOURCEDIR ${CMAKE_SOURCE_DIR} )
-
-# HEADER FILES
-CHECK_INCLUDE_FILE( sys/byteorder.h HAVE_SYS_BYTEORDER_H )
-CHECK_INCLUDE_FILE( AvailabilityMacros.h HAVE_AVAILABILITY_MACROS_H )
-CHECK_INCLUDE_FILE( TargetConditionals.h HAVE_TARGET_CONDITIONALS_H )
-CHECK_INCLUDE_FILE( libkern/OSAtomic.h HAVE_LIBKERN_OSATOMIC_H )
-
-# FUNCTIONS
-CHECK_FUNCTION_EXISTS( sysconf HAVE_SYSCONF )
-CHECK_SYMBOL_EXISTS( OSAtomicCompareAndSwapInt libkern/OSAtomic.h HAVE_OSATOMIC_COMPARE_AND_SWAP_INT )
-CHECK_SYMBOL_EXISTS( OSAtomicCompareAndSwapLong libkern/OSAtomic.h HAVE_OSATOMIC_COMPARE_AND_SWAP_LONG )
-
-# BUILTIN
-CHECK_C_SOURCE_COMPILES( "
-volatile int a;
-int main(int argc, char *argv[]) {
-  (void)__sync_bool_compare_and_swap(&a, 1, 2);
-  return 0;
-}
-" HAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT )
-
-CHECK_C_SOURCE_COMPILES( "
-volatile long a;
-int main(int argc, char *argv[]) {
-  (void)__sync_bool_compare_and_swap(&a, 1, 2);
-  return 0;
-}
-" HAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG )

Copied: compiler-rt/trunk/cmake/ConfigureChecks.cmake (from r86542, compiler-rt/trunk/ConfigureChecks.cmake)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/ConfigureChecks.cmake?p2=compiler-rt/trunk/cmake/ConfigureChecks.cmake&p1=compiler-rt/trunk/ConfigureChecks.cmake&r1=86542&r2=93318&rev=93318&view=diff

==============================================================================
    (empty)

Copied: compiler-rt/trunk/cmake/config.h.cmake (from r86542, compiler-rt/trunk/config.h.cmake)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config.h.cmake?p2=compiler-rt/trunk/cmake/config.h.cmake&p1=compiler-rt/trunk/config.h.cmake&r1=86542&r2=93318&rev=93318&view=diff

==============================================================================
    (empty)

Removed: compiler-rt/trunk/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/config.h.cmake?rev=93317&view=auto

==============================================================================
--- compiler-rt/trunk/config.h.cmake (original)
+++ compiler-rt/trunk/config.h.cmake (removed)
@@ -1,12 +0,0 @@
-#cmakedefine HAVE_SYS_BYTEORDER_H ${HAVE_SYS_BYTEORDER}
-#cmakedefine HAVE_AVAILABILITY_MACROS_H ${HAVE_AVAILABILITY_MACROS_H}
-#cmakedefine HAVE_TARGET_CONDITIONALS_H ${HAVE_TARGET_CONDITIONALS_H}
-#cmakedefine HAVE_LIBKERN_OSATOMIC_H ${HAVE_LIBKERN_OSATOMIC_H}
-
-#cmakedefine HAVE_SYSCONF ${HAVE_SYSCONF}
-
-#cmakedefine HAVE_OSATOMIC_COMPARE_AND_SWAP_INT ${HAVE_OSATOMIC_COMPARE_AND_SWAP_INT}
-#cmakedefine HAVE_OSATOMIC_COMPARE_AND_SWAP_LONG ${HAVE_OSATOMIC_COMPARE_AND_SWAP_LONG}
-
-#cmakedefine HAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT ${HAVE_SYNC_BOOL_COMPARE_AND_SWAP_INT}
-#cmakedefine HAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG ${HAVE_SYNC_BOOL_COMPARE_AND_SWAP_LONG}