Skip to content

Commit 3af240c

Browse files
committed
Final makefile and cmake parity updates
1 parent 6f8a526 commit 3af240c

3 files changed

Lines changed: 271 additions & 72 deletions

File tree

.github/workflows/build.yml

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ jobs:
2828
shell: bash
2929
run: make check
3030

31-
build-cmake:
31+
build-cmake-unix:
3232
runs-on: ${{ matrix.os }}
3333
strategy:
34+
fail-fast: false
3435
matrix:
35-
os: [macos-latest, ubuntu-latest, windows-latest]
36+
os: [macos-latest, ubuntu-latest]
37+
qt_detection: [cmake, autoconf]
3638

3739
steps:
3840
- uses: actions/checkout@v4
@@ -43,9 +45,58 @@ jobs:
4345
- name: Configure CMake
4446
shell: bash
4547
working-directory: ${{github.workspace}}/build
46-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
48+
run: >
49+
cmake $GITHUB_WORKSPACE
50+
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
51+
-DGECODE_QT_DETECTION=${{ matrix.qt_detection }}
4752
4853
- name: Build
4954
working-directory: ${{github.workspace}}/build
5055
shell: bash
5156
run: cmake --build . --config $BUILD_TYPE
57+
58+
- name: Check
59+
working-directory: ${{github.workspace}}/build
60+
shell: bash
61+
run: cmake --build . --config $BUILD_TYPE --target check
62+
63+
build-cmake-windows:
64+
runs-on: windows-latest
65+
strategy:
66+
fail-fast: false
67+
matrix:
68+
include:
69+
- name: shared
70+
build_shared: ON
71+
build_static: OFF
72+
- name: static
73+
build_shared: OFF
74+
build_static: ON
75+
76+
steps:
77+
- uses: actions/checkout@v4
78+
79+
- name: Create Build Environment
80+
shell: bash
81+
run: cmake -E make_directory ${{github.workspace}}/build
82+
83+
- name: Configure CMake
84+
shell: bash
85+
working-directory: ${{github.workspace}}/build
86+
run: >
87+
cmake $GITHUB_WORKSPACE
88+
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
89+
-DGECODE_ENABLE_QT=OFF
90+
-DGECODE_ENABLE_GIST=OFF
91+
-DGECODE_BUILD_SHARED=${{ matrix.build_shared }}
92+
-DGECODE_BUILD_STATIC=${{ matrix.build_static }}
93+
94+
- name: Build
95+
working-directory: ${{github.workspace}}/build
96+
shell: bash
97+
run: cmake --build . --config $BUILD_TYPE
98+
99+
- name: Build test binary
100+
working-directory: ${{github.workspace}}/build
101+
shell: bash
102+
run: cmake --build . --config $BUILD_TYPE --target gecode-test

0 commit comments

Comments
 (0)