Skip to content

Commit 2a3912a

Browse files
committed
Fix IDICMAKE_PLATFORM_CONFIG
1 parent b4c9f3b commit 2a3912a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.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 -DIDICMAKE_PLATFORM_CONFIG=../platform_config.$TYPE.cmake
32+
cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
3333
- name: Build
3434
shell: bash
3535
run: |

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ build-linux:
2323
script:
2424
- cmake --version && $CC --version && $CXX --version
2525
- mkdir -p build && cd build
26-
- cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform_config.$TYPE.cmake
26+
- cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
2727
- cmake --build . -j 8
2828
- ctest -C Debug --output-junit ctest.xml
2929
interruptible: true
@@ -50,7 +50,7 @@ build-linux:
5050
# - cmake --version
5151
# - mkdir -p build
5252
# - cd build
53-
# - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform_config.$TYPE.cmake
53+
# - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
5454
# - cmake --build . -j 8
5555
# - ctest -C Debug --output-junit ctest.xml
5656
# interruptible: true

cmake/idi/functions/framework/idi_load_platform_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ macro(idi_load_platform_config)
1111
idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/platform-local-options.cmake)
1212
idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/cmake-hooks/pre-configure.cmake)
1313

14-
set(IDICMAKE_PLATFORM_CONFIG "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake")
14+
set(IDICMAKE_PLATFORM_CONFIG "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
1515
include("${IDICMAKE_PLATFORM_CONFIG}")
1616

1717
idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/cmake-hooks/post-platform-config.cmake)

0 commit comments

Comments
 (0)