Fix IDICMAKE_PLATFORM_CONFIG being propagated to subprojects

Author: jonpas

.github/workflows/cpp.yml

@@ -29,7 +29,7 @@ jobs:
         mkdir -p build
         cd build
         cmake --version
-        cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG="../platform-config.${{ matrix.type }}.cmake"
+        cmake .. $CMAKE_ARGS -DTEMPLATE_PROJECT_PLATFORM_CONFIG="../platform-config.${{ matrix.type }}.cmake"
     - name: Build
       shell: bash
       run: |

.gitlab-ci.yml

@@ -22,7 +22,7 @@ build-linux:
   script:
     - cmake --version && $CC --version && $CXX --version
     - mkdir -p build && cd build
-    - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
+    - cmake .. $CMAKE_ARGS -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
     - cmake --build . -j 8
     - ctest -C Debug --output-junit ctest.xml
   interruptible: true

JenkinsfileTemplate

@@ -16,7 +16,7 @@ pipeline {
             steps {
                 dir('build') {
                     deleteDir()
-                    bat 'cmake .. -DDO_TEMPLATE_COMPONENT_TEST=1'
+                    bat 'cmake .. -DTEMPLATE_PROJECT_DO_TEMPLATE_COMPONENT_TEST=1'
                     bat 'cmake --build .'
                     bat 'ctest -C Debug'
                     junit 'reports/**_report*.xml'
@@ -27,7 +27,7 @@ pipeline {
             steps {
                 dir('build') {
                     deleteDir()
-                    bat 'cmake .. -DIDICMAKE_PLATFORM_CONFIG=../platform_config.static.cmake'
+                    bat 'cmake .. -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.static.cmake'
                     bat 'cmake --build .'
                     bat 'ctest -C Debug'
                     junit 'reports/**_report*.xml'
@@ -38,7 +38,7 @@ pipeline {
             steps {
                 dir('build') {
                     deleteDir()
-                    bat 'cmake .. -DIDICMAKE_PLATFORM_CONFIG=../platform_config.shared.cmake'
+                    bat 'cmake .. -DTEMPLATE_PROJECT_PLATFORM_CONFIG=../platform-config.shared.cmake'
                     bat 'cmake --build .'
                     bat 'ctest -C Debug'
                     junit 'reports/**_report*.xml'

README.md

@@ -31,7 +31,7 @@ $ cmake --build .   # or generated build system command (make, Visual Studio etc
 
 _Use with `cmake .. -D<argument>=<value>`._
 
-- `IDICMAKE_PLATFORM_CONFIG` (default: `platform_config.cmake`) - Platform configuration file.
+- `<PROJECT_NAME>_PLATFORM_CONFIG` (default: `platform_config.cmake`) - Platform configuration file.
 - `IDICMAKE_BUILD_DEMOS` (default: `0`) - Build demo applications if applicable.
 - `IDICMAKE_BUILD_TESTS` (default: `1`) - Build unit tests. _(long)_
 - `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

@@ -11,7 +11,8 @@ macro(idi_load_platform_config)
     idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/platform-local-options.cmake)
     idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/cmake-hooks/pre-configure.cmake)
 
-    set(IDICMAKE_PLATFORM_CONFIG "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
+    set("${IDICMAKE_PREFIX}_PLATFORM_CONFIG" "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
+    set(IDICMAKE_PLATFORM_CONFIG "${${IDICMAKE_PREFIX}_PLATFORM_CONFIG}")
     include("${IDICMAKE_PLATFORM_CONFIG}")
 
     idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/cmake-hooks/post-platform-config.cmake)