diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-06 20:07:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-06 20:07:39 (GMT) |
| commit | 386cf3c593ad425fea9b2bddf5ee34d8d36dfe15 (patch) | |
| tree | 4dabe2b44c04e1f5bf49defd4ce88e3c630d34d9 /Tests | |
| parent | b8c0dd48b045457b97386ed6bad5f31b5788c6c5 (diff) | |
| parent | ae62a1cd35fcd9be8d1beb11c864fbe417de429e (diff) | |
| download | CMake-386cf3c593ad425fea9b2bddf5ee34d8d36dfe15.zip CMake-386cf3c593ad425fea9b2bddf5ee34d8d36dfe15.tar.gz CMake-386cf3c593ad425fea9b2bddf5ee34d8d36dfe15.tar.bz2 | |
Merge topic 'GNU-to-MS'
ae62a1c Test CMAKE_GNUtoMS option in ExportImport on MinGW and MSys
afb00fe Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib
61e8629 Factor makefile generator link rule lookup into helper function
a603250 Load platform files that need to know the ABI when possible
ecd8414 Fortran: Detect pointer size in gfortran on MinGW
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ExportImport/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/ExportImport/InitialCache.cmake.in | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt index 2e01c50..ccfb894 100644 --- a/Tests/ExportImport/CMakeLists.txt +++ b/Tests/ExportImport/CMakeLists.txt @@ -22,6 +22,11 @@ else(CMAKE_CONFIGURATION_TYPES) endif(CMAKE_BUILD_TYPE) endif(CMAKE_CONFIGURATION_TYPES) +if(MINGW OR MSYS) + # Test CMAKE_GNUtoMS whether we have VS or not. + set(ExportImport_GNUtoMS 1) +endif() + configure_file(${ExportImport_SOURCE_DIR}/InitialCache.cmake.in ${ExportImport_BINARY_DIR}/InitialCache.cmake @ONLY) diff --git a/Tests/ExportImport/InitialCache.cmake.in b/Tests/ExportImport/InitialCache.cmake.in index f920b1f..4893f70 100644 --- a/Tests/ExportImport/InitialCache.cmake.in +++ b/Tests/ExportImport/InitialCache.cmake.in @@ -12,3 +12,4 @@ SET(CMAKE_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@" CACHE STRING "C++ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@" CACHE STRING "C++ Flags") SET(CMAKE_INSTALL_PREFIX "@ExportImport_BINARY_DIR@/Root" CACHE STRING "Installation Prefix") SET(CMAKE_SKIP_RPATH ON CACHE BOOL "No RPATH") +SET(CMAKE_GNUtoMS "@ExportImport_GNUtoMS@" CACHE BOOL "CMAKE_GNUtoMS") |