Skip to content

Commit 2ba0aff

Browse files
committed
xyz
Signed-off-by: Viktor Kopp <[email protected]>
1 parent d28c99d commit 2ba0aff

File tree

1 file changed

+29
-5
lines changed

1 file changed

+29
-5
lines changed

.github/workflows/BuildPR.yml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
buildMac:
1111
name: Build macOS
1212
runs-on: ${{ matrix.macos }}
13+
if: false
1314
strategy:
1415
fail-fast: false
1516
matrix:
@@ -120,6 +121,7 @@ jobs:
120121
matrix:
121122
ubuntu: [ ubuntu-22.04, ubuntu-24.04 ]
122123
runs-on: ${{ matrix.ubuntu }}
124+
if: false
123125
steps:
124126
- name: Checkout
125127
uses: actions/checkout@v4
@@ -140,6 +142,7 @@ jobs:
140142
task: [ sdk ]
141143
qt: [ 5 ]
142144
runs-on: windows-latest
145+
if: false
143146
steps:
144147
- name: Checkout
145148
uses: actions/checkout@v4
@@ -188,14 +191,35 @@ jobs:
188191
mkdir build
189192
cd build
190193
echo "QT_ROOT_DIR=$QT_ROOT_DIR"
191-
cmake .. -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR/lib/cmake
194+
APP_DIR_NAME="DLTViewer.app"
195+
cmake -G Ninja -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR/lib/cmake \
196+
-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
197+
-DCMAKE_BUILD_TYPE=Release \
198+
-DDLT_USE_QT_RPATH=ON \
199+
-DDLT_PARSER=OFF \
200+
-DDLT_APP_DIR_NAME=${APP_DIR_NAME} \
201+
-DDLT_LIBRARY_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/Frameworks" \
202+
-DDLT_EXECUTABLE_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/MacOS" \
203+
-DDLT_RESOURCE_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/Resources" \
204+
-DDLT_PLUGIN_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/MacOS/plugins" \
205+
..
192206
193207
- name: Build project
194208
run: |
195-
cmake --build build
209+
cmake --build build --parallel 4
196210
197-
- name: Deploy with macdeployqt
211+
- name: Install and deploy with macdeployqt
198212
run: |
199-
ls -l build/
200-
$QT_ROOT_DIR/bin/macdeployqt build/DLTViewer.app -verbose=1
213+
cmake --install build --prefix $(pwd)/build/install
214+
ls -l build/install/DLTViewer.app
215+
otool -L build/install/DLTViewer.app/Contents/MacOS/dlt-viewer
216+
otool -l build/install/DLTViewer.app/Contents/MacOS/dlt-viewer | grep -A2 LC_RPATH
217+
echo "Deploying DLTViewer.app with macdeployqt"
218+
$QT_ROOT_DIR/bin/macdeployqt build/install/DLTViewer.app -verbose=1 -dmg \
219+
-libpath=$(pwd)/build/install/DLTViewer.app/Contents/Frameworks \
220+
-executable=$(pwd)/build/install/DLTViewer.app/Contents/MacOS/dlt-viewer
201221
222+
- name: Misc
223+
run: |
224+
brew install tree
225+
tree build/install/DLTViewer.app

0 commit comments

Comments
 (0)