Fix IDICMAKE_PLATFORM_CONFIG, Add GitLab Windows CI and simplify

platform config selection in CI

Author: jonpas

.github/workflows/cpp.yml

@@ -11,11 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022]
+        os: [ubuntu-24.04, windows-2022, windows-2025]
         type: [exe, static, shared]
     env:
       CMAKE_ARGS: -DTEMPLATE_PROJECT_BUILD_DEMOS=1 -DTEMPLATE_PROJECT_BUILD_TESTS=1 -DTEMPLATE_PROJECT_USE_BUILD_TIMESTAMPS=1 -DTEMPLATE_PROJECT_DO_TEMPLATE_COMPONENT_TEST=1 -DTEMPLATE_PROJECT_CI_GIT_BRANCH_NAME="${{ github.ref_name }}"
-      CONFIGS: '{ "exe": "platform_config.exe.cmake", "static": "platform_config.static.cmake", "shared": "platform_config.shared.cmake" }'
 
     steps:
     - name: Checkout the source code
@@ -30,7 +29,7 @@ jobs:
         mkdir -p build
         cd build
         cmake --version
-        cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../${{ fromJSON(env.CONFIGS)[matrix.type] }}
+        cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG="../platform-config.${{ matrix.type }}.cmake"
     - name: Build
       shell: bash
       run: |

.gitlab-ci.yml

@@ -11,21 +11,18 @@ build-linux:
     matrix:
       - COMPILER: [gcc-11, gcc-12, gcc-13, clang-11.0.1, clang-12, clang-13, clang-14, clang-15, clang-16, clang-17]
         TYPE: [exe, static, shared]
-  variables:
-    CONFIGS: '{ "exe": "platform_config.exe.cmake", "static": "platform_config.static.cmake", "shared": "platform_config.shared.cmake" }'
   image: $CI_REGISTRY/idi/dockerfiles/cmake-cpp:$COMPILER
   rules:
     - if: $CI_PIPELINE_SOURCE != "merge_request_event" && (($COMPILER =~ /(gcc-14|clang-14)$/)) # clang-14 image has a bug with libc++13
       allow_failure: true
     - if: $CI_PIPELINE_SOURCE != "merge_request_event" # Only on push events (same as 'except: merge_requests')
-  before_script:
-    - apt-get update && apt-get install -y -qq jq
+  before_script: # This is required for pulling dependencies on projects
     - git config --global credential.helper store
     - echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}" > ~/.git-credentials
   script:
     - cmake --version && $CC --version && $CXX --version
     - mkdir -p build && cd build
-    - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../$(echo $CONFIGS | jq -r .$TYPE)
+    - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG=../platform-config.$TYPE.cmake
     - cmake --build . -j 8
     - ctest -C Debug --output-junit ctest.xml
   interruptible: true
@@ -36,3 +33,31 @@ build-linux:
       - build/ctest.xml
     reports:
       junit: build/ctest.xml
+
+build-windows:
+  stage: build
+  tags: [windows, beefy]
+  parallel:
+    matrix:
+      - TYPE: [exe, static, shared]
+  image: $CI_REGISTRY/idi/dockerfiles/cmake-cpp
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "merge_request_event" # Only on push events (same as 'except: merge_requests')
+  before_script: # This is required for pulling dependencies on projects
+    - git config --system credential.helper store
+    - echo "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}`n" > ~/.git-credentials
+  script:
+    - cmake --version
+    - mkdir -p build
+    - cd build
+    - cmake .. $CMAKE_ARGS -DIDICMAKE_PLATFORM_CONFIG="../platform-config.$TYPE.cmake"
+    - cmake --build . -j 8
+    - ctest -C Debug --output-junit ctest.xml
+  interruptible: true
+  artifacts:
+    when: always
+    name: "idi-cpp-template-$TYPE-win64-$CI_COMMIT_SHORT_SHA"
+    paths:
+      - build/ctest.xml
+    reports:
+      junit: build/ctest.xml

cmake/idi/functions/framework/idi_load_platform_config.cmake

@@ -11,7 +11,7 @@ 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")
+    set(IDICMAKE_PLATFORM_CONFIG "${CMAKE_CURRENT_LIST_DIR}/platform-config.cmake" CACHE FILEPATH "Platform config definitions file")
     include("${IDICMAKE_PLATFORM_CONFIG}")
 
     idi_cmake_hook_abs(${CMAKE_CURRENT_LIST_DIR}/cmake-hooks/post-platform-config.cmake)