organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-06 21:55:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge pull request #937 from libexpat/issue-935-autotools-fix-generated-cmake-files-for-macos

Browse source 
Make Autotools-generated CMake files look for `libexpat.@SO_MAJOR@.dylib` (fixes #935)
This commit is contained in:
Sebastian Pipping 2024-12-17 21:04:53 +01:00 • committed by GitHub
commit a39eb0ea8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/autotools-cmake.yml vendored
View file

@ -125,6 +125,20 @@ jobs:
cd expat/expat-*.*.*/
if [[ "${{ runner.os }}" == macOS ]]; then
# There is a known difference between Autotools and CMake for macOS:
# Autotools:
# - /usr/local/lib123/libexpat.<major>.dylib
# - /usr/local/lib123/libexpat.dylib
# CMake:
# - /usr/local/lib123/libexpat.<major>.<minor>.<patch>.dylib
# - /usr/local/lib123/libexpat.<major>.dylib
# - /usr/local/lib123/libexpat.dylib
# We patch the CMake side in line here to get the differ below to empty.
( cd build_cmake/ROOT/usr/local/lib*/cmake/expat-*/ \
&& sed -E 's,(libexpat\.[0-9]+)\.[0-9]+\.[0-9]+(\.dylib),\1\2,' expat-noconfig.cmake > expat-noconfig-patched.cmake \
&& ! diff -u0 expat-noconfig{,-patched}.cmake \
&& mv expat-noconfig{-patched,}.cmake )
# Autotools' LT_LIB_M has a hardcoded exclude for "*-*-darwin*" hosts,
# while macOS does have libm and is successfully found by CMake.
# We patch the CMake side in line here to get the differ below to empty.

4
expat/cmake/autotools/expat-noconfig__macos.cmake.in
View file

@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "expat::expat" for configuration "NoConfig"
set_property(TARGET expat::expat APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
set_target_properties(expat::expat PROPERTIES
IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib"
IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib"
IMPORTED_SONAME_NOCONFIG "@rpath/libexpat.@SO_MAJOR@.dylib"
)
list(APPEND _cmake_import_check_targets expat::expat )
list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib" )
list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib" )
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)