Skip to content

Commit

Permalink
Allow drop in Advanced Import (#277)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lymphatus committed May 26, 2024
1 parent 3430391 commit 86c9362
Show file tree
Hide file tree
Showing 26 changed files with 2,852 additions and 2,700 deletions.
68 changes: 34 additions & 34 deletions .github/workflows/build-qt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,40 +52,40 @@ jobs:
- name: Build
run: cmake --build ${{github.workspace}}/build-${{ runner.os }} --config Release --target caesium_image_compressor

build-macos:
runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache libcaesium
id: cache-libcaesium
uses: actions/cache@v3
env:
cache-name: cache-libcaesium
with:
path: ${{github.workspace}}/build-${{ runner.os }}/libcaesium-prefix
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/libcaesium.conf') }}

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==3.0.*'
version: '6.5.3'
host: 'mac'
target: 'desktop'
arch: 'clang_64'
modules: 'qtimageformats'
cache: true

- name: Setup Sparkle
run: brew install --cask https://github.com/raw/Homebrew/homebrew-cask/c6dfe6baf1639998ba1707f68668cf8fa97bac9d/Casks/sparkle.rb && sudo cp -R /usr/local/Caskroom/sparkle/1.27.1/Sparkle.framework /Library/Frameworks/Sparkle.framework

- name: Configure CMake
run: cmake -B build_dir -DCMAKE_PREFIX_PATH="${{env.Qt6_Dir}}" -DSPARKLE_INCLUDE_DIR=/usr/local/Caskroom/sparkle/1.27.1/Sparkle.framework/Versions/Current/Headers -DLIBSSH_INCLUDE_DIR=/usr/local/opt/openssl/ -DCMAKE_BUILD_TYPE=Release -B ${{github.workspace}}/build-${{ runner.os }}

- name: Build
run: cmake --build ${{github.workspace}}/build-${{ runner.os }} --config Release --target caesium_image_compressor
# build-macos:
# runs-on: macos-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v3
#
# - name: Cache libcaesium
# id: cache-libcaesium
# uses: actions/cache@v3
# env:
# cache-name: cache-libcaesium
# with:
# path: ${{github.workspace}}/build-${{ runner.os }}/libcaesium-prefix
# key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/libcaesium.conf') }}
#
# - name: Install Qt
# uses: jurplel/install-qt-action@v3
# with:
# aqtversion: '==3.0.*'
# version: '6.5.3'
# host: 'mac'
# target: 'desktop'
# arch: 'clang_64'
# modules: 'qtimageformats'
# cache: true
#
# - name: Setup Sparkle
# run: brew install --cask https://github.com/raw/Homebrew/homebrew-cask/c6dfe6baf1639998ba1707f68668cf8fa97bac9d/Casks/sparkle.rb && sudo cp -R /usr/local/Caskroom/sparkle/1.27.1/Sparkle.framework /Library/Frameworks/Sparkle.framework
#
# - name: Configure CMake
# run: cmake -B build_dir -DCMAKE_PREFIX_PATH="${{env.Qt6_Dir}}" -DSPARKLE_INCLUDE_DIR=/usr/local/Caskroom/sparkle/1.27.1/Sparkle.framework/Versions/Current/Headers -DLIBSSH_INCLUDE_DIR=/usr/local/opt/openssl/ -DCMAKE_BUILD_TYPE=Release -B ${{github.workspace}}/build-${{ runner.os }}
#
# - name: Build
# run: cmake --build ${{github.workspace}}/build-${{ runner.os }} --config Release --target caesium_image_compressor

build-ubuntu:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ set(SOURCES
src/utils/PostCompressionActions.cpp
src/dialogs/AboutDialog.cpp
src/widgets/QDropTreeView.cpp
src/widgets/QDropListWidget.cpp
src/widgets/QZoomGraphicsView.cpp
src/widgets/QCaesiumMessageBox.cpp
src/widgets/QMainCheckBox.cpp
Expand Down
Loading

0 comments on commit 86c9362

Please sign in to comment.