diff --git a/.github/workflows/macos_debug.yml b/.github/workflows/macos_debug.yml deleted file mode 100644 index c6afebba2e22..000000000000 --- a/.github/workflows/macos_debug.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: MacOS Debug and Tests - -on: - push: - branches: - - 'master' - - 'Stable*' - tags: - - 'v*' - paths-ignore: - - 'docs/**' - pull_request: - branches: - - '*' - paths-ignore: - - 'docs/**' - -defaults: - run: - shell: bash - -env: - SOURCE_DIR: ${{ github.workspace }} - QT_VERSION: 6.6.* - ARTIFACT: QGroundControl.dmg - BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }} - -jobs: - build: - runs-on: macos-latest - - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - create-symlink: true - key: ${{ runner.os }}-Debug - restore-keys: ${{ runner.os }}-Debug - max-size: "2G" - append-timestamp: false - - - name: Get all tags for correct version determination - working-directory: ${{ github.workspace }} - run: | - git fetch --all --tags -f --depth 1 - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: ${{ env.QT_VERSION }} - aqtversion: ==3.1.* - host: mac - target: desktop - dir: ${{ runner.temp }} - modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d - setup-python: false - cache: true - - - name: Install Dependencies - run: brew install ninja SDL2 - - - name: Setup GStreamer - uses: blinemedical/setup-gstreamer@v1 - with: - version: 1.18.6 - - - name: Create build directory - run: mkdir ${{ runner.temp }}/shadow_build_dir - - - name: Build - working-directory: ${{ runner.temp }}/shadow_build_dir - run: | - cmake -S ${{ env.SOURCE_DIR }} -B ${{ runner.temp }}/shadow_build_dir/ -G Ninja -DCMAKE_BUILD_TYPE=Debug - cmake --build ${{ runner.temp }}/shadow_build_dir/ --target all --config Debug - cmake --install ${{ runner.temp }}/shadow_build_dir - - # - name: Run unit tests - # working-directory: ${{ runner.temp }}/shadow_build_dir - # run: open ${{ runner.temp }}/shadow_build_dir/staging/QGroundControl.app --args --unittest diff --git a/CMakeLists.txt b/CMakeLists.txt index cfa5abf9c93e..274b7fc51f4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,6 +296,8 @@ if(LINUX) install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/CreateAppImage.cmake") endif() if (MACOS) + install(CODE "execute_process(COMMAND rsync -a --delete ${CMAKE_SOURCE_DIR}/libs/Frameworks/SDL2.framework QGroundControl.app/Contents/Frameworks)") + install(CODE "execute_process(COMMAND install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2 QGroundControl.app/Contents/MacOS/QGroundControl)") install(CODE "file(MAKE_DIRECTORY package)") install(CODE "execute_process(COMMAND rsync -a --delete QGroundControl.app package)") install(CODE "file(REMOVE /tmp/tmp.dmg package/QGroundControl.dmg)")