diff options
| author | Brad King <brad.king@kitware.com> | 2024-08-01 15:08:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-08-01 15:08:52 (GMT) |
| commit | 98d86fdc62e84df82536ad73978e4b73a0fafde7 (patch) | |
| tree | 2961a4c9e8bac59af8c164123a029f5040592e06 | |
| parent | b187a4fa644bc8c3957fa559134e7b32592bb8c4 (diff) | |
| parent | cee34d7ab302c666d28c9bc9b6b982c45a1474cf (diff) | |
| download | CMake-98d86fdc62e84df82536ad73978e4b73a0fafde7.zip CMake-98d86fdc62e84df82536ad73978e4b73a0fafde7.tar.gz CMake-98d86fdc62e84df82536ad73978e4b73a0fafde7.tar.bz2 | |
Merge topic 'FindEXPAT-static'
cee34d7ab3 FindEXPAT: Implement EXPAT_USE_STATIC_LIBS for non-Windows platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9694
| -rw-r--r-- | Modules/FindEXPAT.cmake | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 398a415..04a8715 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -39,6 +39,10 @@ Hints Set to ``TRUE`` to use static libraries. + .. versionadded:: 3.31 + + Implemented on non-Windows platforms. + #]=======================================================================] cmake_policy(PUSH) @@ -72,10 +76,24 @@ if(NOT EXPAT_LIBRARY) set(_expat_ORIG_CMAKE_FIND_LIBRARY_PREFIXES) endif() + if(DEFINED CMAKE_FIND_LIBRARY_SUFFIXES) + set(_expat_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}") + else() + set(_expat_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) + endif() + if(WIN32) list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "" "lib") endif() + if (EXPAT_USE_STATIC_LIBS) + if(WIN32) + set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) + else() + set(CMAKE_FIND_LIBRARY_SUFFIXES .a) + endif() + endif() + # Look for the library. find_library(EXPAT_LIBRARY_RELEASE NAMES ${EXPAT_NAMES} NAMES_PER_DIR HINTS ${PC_EXPAT_LIBRARY_DIRS} PATH_SUFFIXES lib) find_library(EXPAT_LIBRARY_DEBUG NAMES ${EXPAT_NAMES_DEBUG} NAMES_PER_DIR HINTS ${PC_EXPAT_LIBRARY_DIRS} PATH_SUFFIXES lib) @@ -87,6 +105,12 @@ if(NOT EXPAT_LIBRARY) set(CMAKE_FIND_LIBRARY_PREFIXES) endif() + if(DEFINED _expat_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) + set(CMAKE_FIND_LIBRARY_SUFFIXES "${_expat_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}") + else() + set(CMAKE_FIND_LIBRARY_SUFFIXES) + endif() + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(EXPAT) endif() |