diff options
| -rw-r--r-- | Modules/CMakeFortranCompilerABI.F | 4 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Tests/ExportImport/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/Fortran/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/MacRuntimePath/CMakeLists.txt | 4 |
5 files changed, 15 insertions, 2 deletions
diff --git a/Modules/CMakeFortranCompilerABI.F b/Modules/CMakeFortranCompilerABI.F index 7e24553..21ca7ff 100644 --- a/Modules/CMakeFortranCompilerABI.F +++ b/Modules/CMakeFortranCompilerABI.F @@ -20,6 +20,10 @@ PRINT *, 'INFO:sizeof_dptr[8]' #elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4 PRINT *, 'INFO:sizeof_dptr[4]' +#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 8 + PRINT *, 'INFO:sizeof_dptr[8]' +#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 4 + PRINT *, 'INFO:sizeof_dptr[4]' #endif #if 0 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d507535..8cd4750 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 12) -set(CMake_VERSION_TWEAK 20131205) +set(CMake_VERSION_TWEAK 20131209) #set(CMake_VERSION_RC 1) diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt index 8be8d33..02a0371 100644 --- a/Tests/ExportImport/CMakeLists.txt +++ b/Tests/ExportImport/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required (VERSION 2.7.20090711) project(ExportImport C CXX) +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() # Wipe out the install tree to make sure the exporter works. add_custom_command( diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 8f165ce..adc4308 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required (VERSION 2.6) project(testf C CXX Fortran) +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() + message("CTEST_FULL_OUTPUT ") set(CMAKE_VERBOSE_MAKEFILE 1) message("ENV_FLAGS = $ENV{FFLAGS}") diff --git a/Tests/MacRuntimePath/CMakeLists.txt b/Tests/MacRuntimePath/CMakeLists.txt index a87b41e..5c7b921 100644 --- a/Tests/MacRuntimePath/CMakeLists.txt +++ b/Tests/MacRuntimePath/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 2.8) project(MacRuntimePath) - +if(NOT DEFINED CMAKE_TEST_MAKEPROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") +endif() # Wipe out the install tree to make sure the exporter works. add_custom_command( |