diff options
Diffstat (limited to 'Modules/CMakeBackwardCompatibilityC.cmake')
| -rw-r--r-- | Modules/CMakeBackwardCompatibilityC.cmake | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/Modules/CMakeBackwardCompatibilityC.cmake b/Modules/CMakeBackwardCompatibilityC.cmake index 00e568830..e3b6c823e 100644 --- a/Modules/CMakeBackwardCompatibilityC.cmake +++ b/Modules/CMakeBackwardCompatibilityC.cmake @@ -13,28 +13,28 @@ # License text for the above reference.) # Nothing here yet -IF(CMAKE_GENERATOR MATCHES "Visual Studio 7") - INCLUDE(CMakeVS7BackwardCompatibility) - SET(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7") -IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") - INCLUDE(CMakeVS6BackwardCompatibility) - SET(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") - -IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) +if(CMAKE_GENERATOR MATCHES "Visual Studio 7") + include(CMakeVS7BackwardCompatibility) + set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) +endif() +if(CMAKE_GENERATOR MATCHES "Visual Studio 6") + include(CMakeVS6BackwardCompatibility) + set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) +endif() + +if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) # Old CMake versions did not support OS X universal binaries anyway, # so just get through this with at least some size for the types. - LIST(LENGTH CMAKE_OSX_ARCHITECTURES NUM_ARCHS) - IF(${NUM_ARCHS} GREATER 1) - IF(NOT DEFINED CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - MESSAGE(WARNING "This module does not work with OS X universal binaries.") - SET(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES 1) - LIST(GET CMAKE_OSX_ARCHITECTURES 0 CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - ENDIF() - ENDIF() - - INCLUDE (CheckTypeSize) + list(LENGTH CMAKE_OSX_ARCHITECTURES NUM_ARCHS) + if(${NUM_ARCHS} GREATER 1) + if(NOT DEFINED CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) + message(WARNING "This module does not work with OS X universal binaries.") + set(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES 1) + list(GET CMAKE_OSX_ARCHITECTURES 0 CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) + endif() + endif() + + include (CheckTypeSize) CHECK_TYPE_SIZE(int CMAKE_SIZEOF_INT) CHECK_TYPE_SIZE(long CMAKE_SIZEOF_LONG) CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P) @@ -43,52 +43,52 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) CHECK_TYPE_SIZE(float CMAKE_SIZEOF_FLOAT) CHECK_TYPE_SIZE(double CMAKE_SIZEOF_DOUBLE) - INCLUDE (CheckIncludeFile) + include (CheckIncludeFile) CHECK_INCLUDE_FILE("limits.h" CMAKE_HAVE_LIMITS_H) CHECK_INCLUDE_FILE("unistd.h" CMAKE_HAVE_UNISTD_H) CHECK_INCLUDE_FILE("pthread.h" CMAKE_HAVE_PTHREAD_H) - INCLUDE (CheckIncludeFiles) + include (CheckIncludeFiles) CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h" CMAKE_HAVE_SYS_PRCTL_H) - INCLUDE (TestBigEndian) + include (TestBigEndian) TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) - INCLUDE (FindX11) + include (FindX11) - IF("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") - SET (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.") - ELSE("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") - SET (CMAKE_X_CFLAGS "-I${X11_X11_INCLUDE_PATH}" CACHE STRING + if("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") + set (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.") + else() + set (CMAKE_X_CFLAGS "-I${X11_X11_INCLUDE_PATH}" CACHE STRING "X11 extra flags.") - ENDIF("${X11_X11_INCLUDE_PATH}" MATCHES "^/usr/include$") - SET (CMAKE_X_LIBS "${X11_LIBRARIES}" CACHE STRING + endif() + set (CMAKE_X_LIBS "${X11_LIBRARIES}" CACHE STRING "Libraries and options used in X11 programs.") - SET (CMAKE_HAS_X "${X11_FOUND}" CACHE INTERNAL "Is X11 around.") + set (CMAKE_HAS_X "${X11_FOUND}" CACHE INTERNAL "Is X11 around.") - INCLUDE (FindThreads) + include (FindThreads) - SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING + set (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING "Thread library used.") - SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL + set (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL "Use the pthreads library.") - SET (CMAKE_USE_WIN32_THREADS "${CMAKE_USE_WIN32_THREADS_INIT}" CACHE BOOL + set (CMAKE_USE_WIN32_THREADS "${CMAKE_USE_WIN32_THREADS_INIT}" CACHE BOOL "Use the win32 thread library.") - SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL + set (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL "Use HP pthreads.") - SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL + set (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL "Use sproc libs.") - IF(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - SET(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) - ENDIF() -ENDIF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) + if(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) + set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) + set(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES) + endif() +endif() -MARK_AS_ADVANCED( +mark_as_advanced( CMAKE_HP_PTHREADS CMAKE_THREAD_LIBS CMAKE_USE_PTHREADS |