summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-18 14:37:14 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-18 14:40:25 (GMT)
commita0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1 (patch)
tree89e2e18333095548356f57b9d585c207692d738a
parent4fb9e847c0c757ff6e1ee430bbb9fc2b6b4e2ae6 (diff)
downloadCMake-a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1.zip
CMake-a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1.tar.gz
CMake-a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1.tar.bz2
Windows-GNU: Do not tell find_library to treat '.dll' as linkable
Modern software distributions always use a separate ".dll.a" or ".lib" import library for linking.
-rw-r--r--Help/release/dev/mingw-no-find_library-dll.rst8
-rw-r--r--Modules/Platform/Windows-GNU.cmake2
2 files changed, 9 insertions, 1 deletions
diff --git a/Help/release/dev/mingw-no-find_library-dll.rst b/Help/release/dev/mingw-no-find_library-dll.rst
new file mode 100644
index 0000000..1b0c19b
--- /dev/null
+++ b/Help/release/dev/mingw-no-find_library-dll.rst
@@ -0,0 +1,8 @@
+mingw-no-find_library-dll
+-------------------------
+
+* When building with GNU tools on Windows (MinGW tools), the
+ :command:`find_library` command will no longer consider
+ ``.dll`` files to be linkable libraries. All dynamic link
+ libraries are expected to provide separate ``.dll.a`` or
+ ``.lib`` import libraries.
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index ffc5657..a7653cf 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -35,7 +35,7 @@ endif()
if(MINGW)
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
endif()