kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'revert-mingw-no-find_library-dll' into release

This commit is contained in:
Brad King 2015-06-08 14:18:04 -04:00
parent 40e1ed9f9d f5dbf00da6
commit 7ac02e0bc5
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Help/release/3.3.rst
View File

@ -251,12 +251,6 @@ Deprecated and Removed Features
Projects may populate the :ref:`User Package Registry` to aid Projects may populate the :ref:`User Package Registry` to aid
users building multiple dependent projects one after another. 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 * The :command:`add_definitions()` command no longer causes a
:prop_dir:`DEFINITIONS` directory property to be populated. See policy :prop_dir:`DEFINITIONS` directory property to be populated. See policy
:policy:`CMP0059`. :policy:`CMP0059`.

2
Modules/Platform/Windows-GNU.cmake
View File

@ -35,7 +35,7 @@ endif()
if(MINGW) if(MINGW)
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") 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_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}") set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
endif() endif()