This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via afeb51082864437d99ad97375f24e1f960466c49 (commit) via f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b (commit) from 29450b7c1f9c9f9a3c64d49e0c53c28590247276 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afeb51082864437d99ad97375f24e1f960466c49 commit afeb51082864437d99ad97375f24e1f960466c49 Merge: 29450b7 f5dbf00 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Jun 8 10:16:37 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jun 8 10:16:37 2015 -0400 Merge topic 'mingw-find_library-dll-last' into next f5dbf00d Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b commit f5dbf00da67223c6f1d03cc4c88e05aa83b32f5b Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Jun 8 10:08:59 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Jun 8 10:16:18 2015 -0400 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. 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() ----------------------------------------------------------------------- Summary of changes: Help/release/3.3.rst | 6 ------ Modules/Platform/Windows-GNU.cmake | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits