From 99896f26954c05b523a342c6c837bd5be894153f Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Thu, 9 Feb 2023 13:32:38 +0100
Subject: [PATCH] tweaking cmake toolchains layout

---
 automation/Jenkinsfile                             | 14 +++++++-------
 .../cmake => cmake}/Platform/a72_lp64_qemu.cmake   |  0
 .../aarch64-rtems6-gcc.cmake                       |  3 ---
 .../x64-windows-msvc.cmake                         |  0
 4 files changed, 7 insertions(+), 10 deletions(-)
 rename {unittests/testcfg/rtems/cmake => cmake}/Platform/a72_lp64_qemu.cmake (100%)
 rename unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake => cmake/aarch64-rtems6-gcc.cmake (87%)
 rename unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake => cmake/x64-windows-msvc.cmake (100%)

diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile
index 2cb4fd58a..1b86e8afd 100644
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
         }
     }
     stages {
-        stage('Host-clang') {
+        stage('x64-linux-clang-host') {
             steps {
                 sh 'rm -rf $BUILDDIR_HOST'
 
@@ -25,7 +25,7 @@ pipeline {
                 }
             }
         }
-        stage('Linux-gcc') {
+        stage('x64-linux-gcc') {
             steps {
                 sh 'rm -rf $BUILDDIR_LINUX'
 
@@ -37,7 +37,7 @@ pipeline {
                 }
             }
         }
-        stage('FreeRTOS-gcc') {
+        stage('x64-FreeRTOS-gcc') {
             steps {
                 sh 'rm -rf $BUILDDIR_FREERTOS'
 
@@ -49,23 +49,23 @@ pipeline {
                 }
             }
         }
-        stage('rtems-gcc') {
+        stage('aarch64-rtems6-gcc') {
             steps {
                 sh 'rm -rf $BUILDDIR_RTEMS'
 
                 dir(BUILDDIR_RTEMS) {
-                    sh 'cmake -DFSFW_OSAL=rtems -DFSFW_BUILD_TESTS=ON -DFSFW_TESTS_GEN_COV=OFF -DFSFW_CICD_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake ..'
+                    sh 'cmake -DFSFW_OSAL=rtems -DFSFW_BUILD_TESTS=ON -DFSFW_TESTS_GEN_COV=OFF -DFSFW_CICD_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../cmake/aarch64-rtems6-gcc.cmake ..'
                     sh 'cmake --build . -j4'
                     sh 'qemu-system-aarch64 -no-reboot -nographic -serial mon:stdio -semihosting -machine virt,gic-version=3 -cpu cortex-a72 -m 4000  -kernel fsfw-tests'
                 }
             }
         }
-        stage('Host-msvc') {
+        stage('x64-windows-msvc-host') {
             steps {
                 sh 'rm -rf $BUILDDIR_WIN'
 
                 dir(BUILDDIR_WIN) {
-                    sh 'cmake -DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON -DFSFW_TESTS_GEN_COV=OFF -DFSFW_CICD_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake -GNinja ..'
+                    sh 'cmake -DFSFW_OSAL=host -DFSFW_BUILD_TESTS=ON -DFSFW_TESTS_GEN_COV=OFF -DFSFW_CICD_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../cmake/x64-windows-msvc.cmake -GNinja ..'
                     sh 'cmake --build . -j4'
                     sh 'wine64 fsfw-tests.exe'
                 }
diff --git a/unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake b/cmake/Platform/a72_lp64_qemu.cmake
similarity index 100%
rename from unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake
rename to cmake/Platform/a72_lp64_qemu.cmake
diff --git a/unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake b/cmake/aarch64-rtems6-gcc.cmake
similarity index 87%
rename from unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake
rename to cmake/aarch64-rtems6-gcc.cmake
index 00ad2b696..5caa7d726 100644
--- a/unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake
+++ b/cmake/aarch64-rtems6-gcc.cmake
@@ -31,6 +31,3 @@ add_compile_definitions("__STDC_VERSION__")
 # make newlib behave like glib with an intercepted cmath
 add_compile_options("-I${CMAKE_SOURCE_DIR}/unittests/testcfg/rtems/include")
 
-# we supply an a72_lp64_qemu.cmake there
-list(APPEND CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/unittests/testcfg/rtems/cmake")
diff --git a/unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake b/cmake/x64-windows-msvc.cmake
similarity index 100%
rename from unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake
rename to cmake/x64-windows-msvc.cmake