Switched to conda for osx.t

openstreetmap · Sep 4, 2024 · e924878 · e924878
1 parent a9a3833
commit e924878
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,13 +43,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          brew list
-          brew install gdal exiv2 proj qt${{ matrix.QT_MAJOR }} cmake inih dylibbundler
-          brew unlink exiv2
-          brew install --HEAD exiv2
-          brew link qt${{ matrix.QT_MAJOR }}
+      - name: Install conda
+        - uses: conda-incubator/setup-miniconda@v3
+          with:
+            auto-update-conda: true
+        - name: Conda info
+          run: conda install gdal exiv2 proj qtbase qttools qt5compat cmake
       - name: Build
         run: |
           ./ci/travis-osx-script.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -635,7 +635,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/AppImageBuilder.yml.in" "${PROJECT_B
 # Mac OS X specific deploy scripts
 ##############################################
 if (APPLE)
-  find_program(MACDEPLOYQT macdeployqt)
+  find_program(MACDEPLOYQT macdeployqt6)
   message("Found macdeployqt: ${MACDEPLOYQT}")
   configure_file("${PROJECT_SOURCE_DIR}/cmake/deploy-osx.cmake.in" "${PROJECT_BINARY_DIR}/deploy-osx.cmake" @ONLY)
   set (CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy-osx.cmake")

diff --git a/cmake/deploy-osx.cmake.in b/cmake/deploy-osx.cmake.in
@@ -14,7 +14,7 @@ set(TMP_APPDIR "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@[email protected]")
 execute_process(COMMAND find "${CPACK_TEMPORARY_INSTALL_DIRECTORY}")
 message("Running macdeployqt on ${TMP_APPDIR}")
 execute_process(COMMAND ${MACDEPLOYQT} "${TMP_APPDIR}" -verbose=3)
-message("Running dylibbundler on ${TMP_APPDIR}")
-execute_process(COMMAND dylibbundler -of -b -s /usr/local/lib -x "${TMP_APPDIR}/Contents/MacOS/@PROJECT_NAME@" -d "${TMP_APPDIR}/Contents/Frameworks/")
+execute_process(COMMAND install_name_tool -add_rpath "@executable_path/../Frameworks" "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@[email protected]/Contents/MacOS/merkaartor")
+execute_process(COMMAND otool -l "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/@PROJECT_NAME@.app/Contents/MacOS/merkaartor")
 message("Done bundling.")
 execute_process(COMMAND find "${CPACK_TEMPORARY_INSTALL_DIRECTORY}")