diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-22 19:33:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-02-22 19:33:04 (GMT) |
| commit | 521d2445313e809def1a4c1dfb23dd5ed945fead (patch) | |
| tree | bd590db2f2ec15debf982da5a0cd70613fe253c5 | |
| parent | 59cfdd5c77c8589068963a6c0bc5caadbf86666b (diff) | |
| parent | 6a61a8a5383fe7418cdd893c97328a27b86b08da (diff) | |
| download | CMake-521d2445313e809def1a4c1dfb23dd5ed945fead.zip CMake-521d2445313e809def1a4c1dfb23dd5ed945fead.tar.gz CMake-521d2445313e809def1a4c1dfb23dd5ed945fead.tar.bz2 | |
Merge topic 'mingw-module-definition'
6a61a8a Honor module .def files with MinGW tools (#9997)
| -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 4d4764f..f418058 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1079,8 +1079,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) |