Skip to content

Commit 6ee9f59

Browse files
committed
MacOS: Added support for MacOS14
1 parent d0cff87 commit 6ee9f59

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/c-cpp.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
name: MacOS CI
6060
strategy:
6161
matrix:
62-
os: [macos-12, macos-13]
62+
os: [macos-12, macos-13, macos-14]
6363

6464
runs-on: ${{ matrix.os }}
6565

@@ -98,15 +98,15 @@ jobs:
9898
run: |
9999
cd build
100100
macdeployqt qlog.app
101-
cp /usr/local/lib/libhamlib.dylib qlog.app/Contents/Frameworks/libhamlib.dylib
102-
cp /usr/local/lib/libqt6keychain.dylib qlog.app/Contents/Frameworks/libqt6keychain.dylib
103-
cp /usr/local/lib/libdbus-1.dylib qlog.app/Contents/Frameworks/libdbus-1.dylib
101+
cp `brew --prefix`/lib/libhamlib.dylib qlog.app/Contents/Frameworks/libhamlib.dylib
102+
cp `brew --prefix`/lib/libqt6keychain.dylib qlog.app/Contents/Frameworks/libqt6keychain.dylib
103+
cp `brew --prefix`/lib/libdbus-1.dylib qlog.app/Contents/Frameworks/libdbus-1.dylib
104104
cp `brew --prefix brotli`/lib/libbrotlicommon.1.dylib qlog.app/Contents/Frameworks/libbrotlicommon.1.dylib
105-
cp /usr/local/opt/icu4c/lib/libicui18n.74.dylib qlog.app/Contents/Frameworks/libicui18n.74.dylib
106-
install_name_tool -change /usr/local/lib/libhamlib.dylib @executable_path/../Frameworks/libhamlib.dylib qlog.app/Contents/MacOS/qlog
107-
install_name_tool -change /usr/local/lib/libqt6keychain.dylib @executable_path/../Frameworks/libqt6keychain.dylib qlog.app/Contents/MacOS/qlog
105+
cp `brew --prefix`/opt/icu4c/lib/libicui18n.74.dylib qlog.app/Contents/Frameworks/libicui18n.74.dylib
106+
install_name_tool -change `brew --prefix`/lib/libhamlib.dylib @executable_path/../Frameworks/libhamlib.dylib qlog.app/Contents/MacOS/qlog
107+
install_name_tool -change `brew --prefix`/lib/libqt6keychain.dylib @executable_path/../Frameworks/libqt6keychain.dylib qlog.app/Contents/MacOS/qlog
108108
install_name_tool -change @loader_path/libbrotlicommon.1.dylib @executable_path/../Frameworks/libbrotlicommon.1.dylib qlog.app/Contents/MacOS/qlog
109-
install_name_tool -change /usr/local/opt/icu4c/lib/libicui18n.74.dylib @executable_path/../Frameworks/libicui18n.74.dylib qlog.app/Contents/MacOS/qlog
109+
install_name_tool -change `brew --prefix`/opt/icu4c/lib/libicui18n.74.dylib @executable_path/../Frameworks/libicui18n.74.dylib qlog.app/Contents/MacOS/qlog
110110
otool -L qlog.app/Contents/MacOS/qlog
111111
macdeployqt qlog.app -dmg
112112
codesign --force --deep -s - /Users/runner/work/QLog/QLog/build/qlog.dmg

QLog.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ macx: {
462462
INSTALLS += target
463463
}
464464

465-
INCLUDEPATH += /usr/local/include
466-
LIBS += -L/usr/local/lib -lhamlib -lsqlite3
465+
INCLUDEPATH += /usr/local/include /opt/homebrew/include
466+
LIBS += -L/usr/local/lib -L/opt/homebrew/lib -lhamlib -lsqlite3
467467
equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain
468468
equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain
469469
DISTFILES +=

0 commit comments

Comments
 (0)