Browse Source

Merge topic 'revert-find_library-msvc-libfoo.a'

955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7962
Brad King 3 years ago
parent
commit
4751c9399e
2 changed files with 15 additions and 7 deletions
  1. 13 5
      Help/release/3.25.rst
  2. 2 2
      Modules/Platform/Windows.cmake

+ 13 - 5
Help/release/3.25.rst

@@ -223,11 +223,6 @@ Deprecated and Removed Features
 Other Changes
 =============
 
-* On Windows, when targeting the MSVC ABI, the :command:`find_library` command
-  now accepts ``.a`` file names after first considering ``.lib``.  This is
-  symmetric with existing behavior when targeting the GNU ABI, in which the
-  command accepts ``.lib`` file names after first considering ``.a``.
-
 * The :envvar:`SSL_CERT_FILE` and :envvar:`SSL_CERT_DIR` environment
   variables can now be used to override where to find certificate
   authorities for TLS/SSL operations.
@@ -238,3 +233,16 @@ Other Changes
 * The :generator:`Xcode` generator no longer adds the per-config suffix
   ``$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)`` to library search paths.
   See policy :policy:`CMP0142`.
+
+Updates
+=======
+
+Changes made since CMake 3.25.0 include the following.
+
+3.25.1
+------
+
+* On Windows, when targeting the MSVC ABI, the :command:`find_library`
+  command no longer accepts ``.a`` file names.  This behavior was added
+  in CMake 3.25.0, but has been reverted due finding GNU-ABI libraries
+  in cases we did not previously.

+ 2 - 2
Modules/Platform/Windows.cmake

@@ -19,8 +19,8 @@ set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
 set(CMAKE_DL_LIBS "")
 set(CMAKE_EXTRA_LINK_EXTENSIONS ".targets")
 
-set(CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+set(CMAKE_FIND_LIBRARY_PREFIXES "")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 
 # for borland make long command lines are redirected to a file
 # with the following syntax, see Windows-bcc32.cmake for use