From: Pierre Ossman Date: Wed, 16 Nov 2022 14:48:32 +0000 (+0100) Subject: Handle alternative library suffixes X-Git-Tag: v1.13.90~96^2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e41b08292872531535518b20d32b1885db3cce48;p=tigervnc.git Handle alternative library suffixes I think this only affects macOS at the moment where they also have .tbd files for linking. --- diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake index 423d3dfb..4f3c9021 100644 --- a/cmake/Modules/CMakeMacroLibtoolFile.cmake +++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake @@ -41,7 +41,15 @@ macro(libtool_create_control_file _target) # Assume all entries are shared libs if platform-specific static library # extension is not matched. elseif(NOT "${library}" MATCHES ".+${CMAKE_STATIC_LIBRARY_SUFFIX}$") - if("${library}" MATCHES ".+${CMAKE_SHARED_LIBRARY_SUFFIX}$") + set(SHARED OFF) + foreach(suffix ${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}) + if("${library}" MATCHES ".+${suffix}$") + set(SHARED ON) + break() + endif() + endforeach() + + if(SHARED) # Shared library extension matched, so extract the path and library # name, then add the result to the libtool dependency libs. This # will always be an absolute path, because that's what CMake uses