diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-21 18:30:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-02-21 19:34:54 (GMT) |
| commit | 6a61a8a5383fe7418cdd893c97328a27b86b08da (patch) | |
| tree | 564203061b40b016094601e6849283662928884e | |
| parent | 1ca15f85f10704b382d5459f88d57839b7462c55 (diff) | |
| download | CMake-6a61a8a5383fe7418cdd893c97328a27b86b08da.zip CMake-6a61a8a5383fe7418cdd893c97328a27b86b08da.tar.gz CMake-6a61a8a5383fe7418cdd893c97328a27b86b08da.tar.bz2 | |
Honor module .def files with MinGW tools (#9997)
Since commit 024d05ad (Fix use of module .def files for MS tools,
2009-09-29) module .def files work for any platform that sets
CMAKE_LINK_DEF_FILE_FLAG correctly. Set it in the Windows-GNU platform
information file to enable support with MinGW tools. Also enable the
test added by commit 0db2c850 (Test use of module .def files for MS
tools, 2009-09-29) for MinGW and MSYS generators.
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 1 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index 7084b83..8df0bcb 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -43,6 +43,7 @@ endif() set(CMAKE_DL_LIBS "") set(CMAKE_LIBRARY_PATH_FLAG "-L") set(CMAKE_LINK_LIBRARY_FLAG "-l") +set(CMAKE_LINK_DEF_FILE_FLAG "-Wl,") set(CMAKE_LINK_LIBRARY_SUFFIX "") set(CMAKE_CREATE_WIN32_EXE "-mwindows") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2c11919..5dc35ba 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1082,8 +1082,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ IF(CMAKE_TEST_MSVC) ADD_TEST_MACRO(ForceInclude foo) ADD_TEST_MACRO(PrecompiledHeader foo) + ENDIF() + IF(CMAKE_TEST_MSVC OR + "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles") ADD_TEST_MACRO(ModuleDefinition example_exe) - ENDIF(CMAKE_TEST_MSVC) + ENDIF() ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables) |