summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-01-22 14:18:46 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-01-22 14:19:09 (GMT)
commit5d1e689e6814283f3920cbb963fe22393e790eae (patch)
treec41b1b420579f36817992ea9b20038d0ec724ddd /Modules
parent5f415b9b1557559d1d9af42fa325a65b16898ddf (diff)
parentc6efbd78d86798573654d1a791f76de0e71bd93f (diff)
downloadCMake-5d1e689e6814283f3920cbb963fe22393e790eae.zip
CMake-5d1e689e6814283f3920cbb963fe22393e790eae.tar.gz
CMake-5d1e689e6814283f3920cbb963fe22393e790eae.tar.bz2
Merge topic 'find_library-msvc-libfoo.a'
c6efbd78d8 MSVC: Teach find_library to consider the 'libfoo.a' naming convention Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9173
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Windows.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake
index bc93caa..af7335b 100644
--- a/Modules/Platform/Windows.cmake
+++ b/Modules/Platform/Windows.cmake
@@ -13,10 +13,14 @@ set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
set(CMAKE_DL_LIBS "")
set(CMAKE_EXTRA_LINK_EXTENSIONS ".targets")
-set(CMAKE_FIND_LIBRARY_PREFIXES "")
+set(CMAKE_FIND_LIBRARY_PREFIXES
+ "" # static or import library from MSVC tooling
+ "lib" # static library from Meson with MSVC tooling
+ )
set(CMAKE_FIND_LIBRARY_SUFFIXES
".dll.lib" # import library from Rust toolchain for MSVC ABI
".lib" # static or import library from MSVC tooling
+ ".a" # static library from Meson with MSVC tooling
)
# for borland make long command lines are redirected to a file