Skip to content

Commit

Permalink
fix macosx qt5 build
Browse files Browse the repository at this point in the history
  • Loading branch information
whoozle committed Jan 8, 2025
1 parent 477db54 commit e19ac39
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Checking out sources...
uses: actions/checkout@v4
- name: Configuring...
run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="/usr/local/opt/qt@5/" -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -DOPENSSL_LIBRARIES=/usr/local/opt/[email protected]/lib -DCMAKE_INSTALL_PREFIX=appdir -B build -G Ninja .
run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$(brew --prefix qt@5) -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -DOPENSSL_LIBRARIES=/usr/local/opt/[email protected]/lib -DCMAKE_INSTALL_PREFIX=appdir -B build -G Ninja .
- name: Building...
run: ninja -j$(sysctl -n hw.ncpu) -C build
- name: Installing...
Expand Down
14 changes: 7 additions & 7 deletions qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ if(DESIRED_QT_VERSION)
find_package(Qt6LinguistTools QUIET)
endif()
else()
find_package(Qt6Widgets QUIET)
find_package(Qt6Network QUIET)
find_package(Qt6LinguistTools QUIET)
find_package(Qt5Widgets QUIET)
find_package(Qt5Network QUIET)
find_package(Qt5LinguistTools QUIET)
find_package(Qt4 QUIET)
find_package(Qt6Widgets)
find_package(Qt6Network)
find_package(Qt6LinguistTools)
find_package(Qt5Widgets)
find_package(Qt5Network)
find_package(Qt5LinguistTools)
find_package(Qt4)
endif()

set(SOURCES main.cpp
Expand Down

0 comments on commit e19ac39

Please sign in to comment.