[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-418-g77031a5
Brad King
brad.king at kitware.com
Wed Feb 18 12:47:26 EST 2015
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 77031a5070d629430d60e2fd43d5f6fd5e1e00dc (commit)
via a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1 (commit)
from 29a45d5906f8c4d13414c659dc7f0b03eb3213b1 (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=77031a5070d629430d60e2fd43d5f6fd5e1e00dc
commit 77031a5070d629430d60e2fd43d5f6fd5e1e00dc
Merge: 29a45d5 a0f17fb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 12:47:26 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 12:47:26 2015 -0500
Merge topic 'mingw-no-find_library-dll' into next
a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1
commit a0f17fbe9cc8c8d30d8c1a4df50c4af5fc4e63d1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:37:14 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:40:25 2015 -0500
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.
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()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/mingw-no-find_library-dll.rst | 8 ++++++++
Modules/Platform/Windows-GNU.cmake | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 Help/release/dev/mingw-no-find_library-dll.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list