From ca298b5821be08a7578d99a95e72436b7a9195bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= Date: Sat, 31 Aug 2024 17:10:43 +0200 Subject: [PATCH] Libtool change. --- CMakeLists.txt | 2 +- ci/travis-osx-script.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c0f35f2..a1df347e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -553,7 +553,7 @@ list(APPEND MERKAARTOR_LINK_LIBS ${PKGCONFIG_DEPS_LIBRARIES}) link_directories(${PKGCONFIG_DEPS_LIBRARY_DIRS}) if (APPLE) - list(APPEND MERKAARTOR_LINK_LIBS "-lltdl") + list(APPEND MERKAARTOR_LINK_LIBS "-llibtool") endif() diff --git a/ci/travis-osx-script.sh b/ci/travis-osx-script.sh index 6191ed87..5a451326 100755 --- a/ci/travis-osx-script.sh +++ b/ci/travis-osx-script.sh @@ -6,6 +6,7 @@ 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*" cmake .. -G"Unix Makefiles" -DCMAKE_PREFIX_PATH="$QT_PREFIX" -DCMAKE_BUILD_TYPE=Release -DEXTRA_TESTS=OFF make -j4 make test