diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-28 20:37:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-28 20:42:27 (GMT) |
| commit | 955d6245c14a4bfe8b4a7a2304ec998bfc6a5561 (patch) | |
| tree | b0917942f807bef19daa20cbbaf7eb346c9811b9 | |
| parent | 90907c8ff96ff07f0dafc1f4904d25b1e10f014b (diff) | |
| download | CMake-955d6245c14a4bfe8b4a7a2304ec998bfc6a5561.zip CMake-955d6245c14a4bfe8b4a7a2304ec998bfc6a5561.tar.gz CMake-955d6245c14a4bfe8b4a7a2304ec998bfc6a5561.tar.bz2 | |
MSVC: Revert "Teach find_library to consider the 'libfoo.a' naming convention"
Revert commit be848a71b0 (MSVC: Teach find_library to consider the
'libfoo.a' naming convention, 2022-09-19, v3.25.0-rc1~111^2). When
targeting the MSVC ABI, this causes GNU-ABI libraries to be found in
cases they were not previously, and broke existing builds. Revert the
change pending further discussion on how to handle the motivating use
case.
Issue: #23975
Fixes: #24168
| -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 |