diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 18:18:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-08 18:18:04 (GMT) |
| commit | 7ac02e0bc555dc1361d1b73e6608ca9c9b784033 (patch) | |
| tree | d100f4f77bc4ff41b8edb241f4c9c82c60d45589 | |
| parent | 40e1ed9f9d0aa6b4e33bbbf71eece5175e098c8d (diff) | |
| parent | f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b (diff) | |
| download | CMake-7ac02e0bc555dc1361d1b73e6608ca9c9b784033.zip CMake-7ac02e0bc555dc1361d1b73e6608ca9c9b784033.tar.gz CMake-7ac02e0bc555dc1361d1b73e6608ca9c9b784033.tar.bz2 | |
Merge branch 'revert-mingw-no-find_library-dll' into release
| -rw-r--r-- | Help/release/3.3.rst | 6 | ||||
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Help/release/3.3.rst b/Help/release/3.3.rst index 15127cc..0beb354 100644 --- a/Help/release/3.3.rst +++ b/Help/release/3.3.rst @@ -251,12 +251,6 @@ Deprecated and Removed Features Projects may populate the :ref:`User Package Registry` to aid users building multiple dependent projects one after another. -* 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. - * The :command:`add_definitions()` command no longer causes a :prop_dir:`DEFINITIONS` directory property to be populated. See policy :policy:`CMP0059`. 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() |