Skip to content

Commit 3b1e89e

Browse files
committed
Fix IDICMAKE_PLATFORM_CONFIG properly, Update framework version to v5.3.0
1 parent 2f575ab commit 3b1e89e

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $ cmake --build . # or generated build system command (make, Visual Studio etc
3131

3232
_Use with `cmake .. -D<argument>=<value>`._
3333

34-
- `<PROJECT_NAME>_PLATFORM_CONFIG` (default: `platform_config.cmake`) - Platform configuration file.
34+
- `IDICMAKE_PLATFORM_CONFIG` (default: `platform_config.cmake`) - Platform configuration file (only for top-level project)
3535
- `IDICMAKE_BUILD_DEMOS` (default: `0`) - Build demo applications if applicable.
3636
- `IDICMAKE_BUILD_TESTS` (default: `1`) - Build unit tests. _(long)_
3737
- `DO_TEMPLATE_COMPONENT_TEST` (default: `0`) - Generate unit test template component and build unit tests for template.

cmake/idi/functions/framework/idi_load_platform_config.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ 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_PREFIX}_PLATFORM_CONFIG" "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
15-
set(IDICMAKE_PLATFORM_CONFIG "${${IDICMAKE_PREFIX}_PLATFORM_CONFIG}")
14+
set(IDICMAKE_PLATFORM_CONFIG "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
1615
include("${IDICMAKE_PLATFORM_CONFIG}")
16+
unset(IDICMAKE_PLATFORM_CONFIG CACHE) # prevent propagation to subprojects using this template
1717

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

cmake/idi/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
set(IDICMAKE_CPP_FRAMEWORK_VERSION_MAJOR 5)
1414

1515
# Minor increments on backwards compat updates!
16-
set(IDICMAKE_CPP_FRAMEWORK_VERSION_MINOR 2)
16+
set(IDICMAKE_CPP_FRAMEWORK_VERSION_MINOR 3)
1717

1818
# Hot fixes, which should be rare in this case.
1919
set(IDICMAKE_CPP_FRAMEWORK_VERSION_HOTFIX 0)

0 commit comments

Comments
 (0)