diff options
author | Brad King <brad.king@kitware.com> | 2022-11-29 15:15:46 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-29 15:15:55 (GMT) |
commit | 4c2952c5cb95e06e3f9c096d71bc342bfa2d4443 (patch) | |
tree | d8bcb4c93ae8f1adb5d3669a6b24d330443bf6b0 | |
parent | 30e5ef9659809952d48f9b5284758c6de2a63681 (diff) | |
parent | 955d6245c14a4bfe8b4a7a2304ec998bfc6a5561 (diff) | |
download | CMake-4c2952c5cb95e06e3f9c096d71bc342bfa2d4443.zip CMake-4c2952c5cb95e06e3f9c096d71bc342bfa2d4443.tar.gz CMake-4c2952c5cb95e06e3f9c096d71bc342bfa2d4443.tar.bz2 |
Merge topic 'revert-find_library-msvc-libfoo.a' into release-3.25
955d6245c1 MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7962
-rw-r--r-- | Help/release/3.25.rst | 18 | ||||
-rw-r--r-- | Modules/Platform/Windows.cmake | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/Help/release/3.25.rst b/Help/release/3.25.rst index 7d0cf0a..fdf8a94 100644 --- a/Help/release/3.25.rst +++ b/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. diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake index 5263161..d8b3957 100644 --- a/Modules/Platform/Windows.cmake +++ b/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 |