macos rpath?

Neverous · May 16, 2023 · d10aaf0 · d10aaf0
1 parent 0fdda8b
commit d10aaf0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 85 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,8 +28,6 @@ jobs:
       matrix:
         qt-version:
           - 5.15.2 # OS LTS
-          - 6.2.4 # LTS
-          - 6.5.0 # latest
 
     steps:
       - name: Checkout source code

diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -13,56 +13,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-linux:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        compiler:
-          - Clang
-          - GCC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
-  build-windows:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2019, windows-2022]
-        compiler:
-          - Clang
-          - MSVC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
   build-macos:
     name: ${{ matrix.os }} with ${{ matrix.compiler }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-13]
         compiler:
           - Clang
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -407,10 +407,10 @@ elseif(APPLE)
         find_program(MACDEPLOYQT_EXECUTABLE NAMES macdeployqt HINTS ${QT${QT_VERSION_MAJOR}_INSTALL_PREFIX}/bin REQUIRED)
     endif()
 
-    add_custom_command(TARGET ${PROJECT_NAME}
-        POST_BUILD
-        COMMAND ${MACDEPLOYQT_EXECUTABLE} "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>" -always-overwrite
-    )
+    #add_custom_command(TARGET ${PROJECT_NAME}
+    #    POST_BUILD
+    #    COMMAND ${MACDEPLOYQT_EXECUTABLE} "$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>" -always-overwrite -dmg
+    #)
 else()
     if(NOT LINUXDEPLOY_EXECUTABLE)
         find_program(LINUXDEPLOY_EXECUTABLE NAMES linuxdeploy linuxdeploy-x86_64.AppImage)