From 216a3960753e796d5aa80348862642688fcf44b6 Mon Sep 17 00:00:00 2001 From: Ladislav Laska Date: Mon, 2 Sep 2024 13:07:15 +0200 Subject: [PATCH] Bundle libltdl manually. --- ci/travis-osx-script.sh | 3 +-- cmake/deploy-osx.cmake.in | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/travis-osx-script.sh b/ci/travis-osx-script.sh index 5a451326..d81601bb 100755 --- a/ci/travis-osx-script.sh +++ b/ci/travis-osx-script.sh @@ -5,8 +5,7 @@ set -ev mkdir build && cd build QT_PREFIX=`brew --prefix qt${QT_MAJOR}` echo "Using QT_PREFIX=$QT_PREFIX" -find /usr/local -name "QtD*.framework" -find / -name "libltdl*" +ls -all /usr/local/lib/libltdl* cmake .. -G"Unix Makefiles" -DCMAKE_PREFIX_PATH="$QT_PREFIX" -DCMAKE_BUILD_TYPE=Release -DEXTRA_TESTS=OFF make -j4 make test diff --git a/cmake/deploy-osx.cmake.in b/cmake/deploy-osx.cmake.in index ba822293..c8fd9343 100644 --- a/cmake/deploy-osx.cmake.in +++ b/cmake/deploy-osx.cmake.in @@ -12,4 +12,5 @@ endforeach() execute_process(COMMAND find "${CPACK_TEMPORARY_INSTALL_DIRECTORY}") execute_process(COMMAND ${MACDEPLOYQT} "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@PROJECT_NAME@.app") +execute_process(COMMAND cp /usr/local/lib/libltdl.*.dylib "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@PROJECT_NAME@.app/Contents/Frameworks/") execute_process(COMMAND find "${CPACK_TEMPORARY_INSTALL_DIRECTORY}")