Skip to content

Commit 6fe982c

Browse files
committed
Fix CI platform config use
1 parent 3b1e89e commit 6fe982c

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
mkdir -p build
3030
cd build
3131
cmake --version
32-
cmake .. $CMAKE_ARGS -DTEMPLATE_PROJECT_PLATFORM_CONFIG="../platform-config.${{ matrix.type }}.cmake"
32+
cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG="../platform-config.${{ matrix.type }}.cmake"
3333
- name: Build
3434
shell: bash
3535
run: |

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ build-linux:
2222
script:
2323
- cmake --version && $CC --version && $CXX --version
2424
- mkdir -p build && cd build
25-
- cmake .. $CMAKE_ARGS -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
25+
- cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
2626
- cmake --build . -j 8
2727
- ctest -C Debug --output-junit ctest.xml
2828
interruptible: true

JenkinsfileTemplate

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
steps {
2828
dir('build') {
2929
deleteDir()
30-
bat 'cmake .. -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.static.cmake'
30+
bat 'cmake .. -DIDICMAKE_PLATFORM_CONFIG=../platform-config.static.cmake'
3131
bat 'cmake --build .'
3232
bat 'ctest -C Debug'
3333
junit 'reports/**_report*.xml'
@@ -38,7 +38,7 @@ pipeline {
3838
steps {
3939
dir('build') {
4040
deleteDir()
41-
bat 'cmake .. -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.shared.cmake'
41+
bat 'cmake .. -DIDICMAKE_PLATFORM_CONFIG=../platform-config.shared.cmake'
4242
bat 'cmake --build .'
4343
bat 'ctest -C Debug'
4444
junit 'reports/**_report*.xml'

0 commit comments

Comments
 (0)