summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-08 14:08:59 (GMT)
committerBrad King <brad.king@kitware.com>2015-06-08 14:16:18 (GMT)
commitf5dbf00da67223c6f1d03cc4c88e05aa83b32f5b (patch)
treecde038f91cf487848fb2dcc21b7d7029f41afdf0 /Modules
parentb8746c4cfe325f05dbcb4e9a99ca78496c90e74e (diff)
downloadCMake-f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b.zip
CMake-f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b.tar.gz
CMake-f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b.tar.bz2
Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409)
Revert commit v3.3.0-rc1~435^2 (Windows-GNU: Do not tell find_library to treat '.dll' as linkable, 2015-02-18). MinGW tools support linking to '.dll' files directly and many non-CMake build systems still do not provide a separate '.dll.a' file.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Windows-GNU.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index b571b16..b97409c 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.a" ".a" ".lib")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".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()