mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

tweaking cmake toolchains layout

Browse Source
This commit is contained in:
Ulrich Mohr 2023-02-09 13:32:38 +01:00
parent 45b686a028
commit 99896f2695
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
automation/Jenkinsfile vendored
View File

@ -14,7 +14,7 @@ pipeline {
} }
} }
stages { stages {
stage('Host-clang') { stage('x64-linux-clang-host') {
steps { steps {
sh 'rm -rf $BUILDDIR_HOST' sh 'rm -rf $BUILDDIR_HOST'
@ -25,7 +25,7 @@ pipeline {
} }
} }
} }
stage('Linux-gcc') { stage('x64-linux-gcc') {
steps { steps {
sh 'rm -rf $BUILDDIR_LINUX' sh 'rm -rf $BUILDDIR_LINUX'
@ -37,7 +37,7 @@ pipeline {
} }
} }
} }
stage('FreeRTOS-gcc') { stage('x64-FreeRTOS-gcc') {
steps { steps {
sh 'rm -rf $BUILDDIR_FREERTOS' sh 'rm -rf $BUILDDIR_FREERTOS'
@ -49,23 +49,23 @@ pipeline {
} }
} }
} }
stage('rtems-gcc') { stage('aarch64-rtems6-gcc') {
steps { steps {
sh 'rm -rf $BUILDDIR_RTEMS' sh 'rm -rf $BUILDDIR_RTEMS'
dir(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 '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' 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 { steps {
sh 'rm -rf $BUILDDIR_WIN' sh 'rm -rf $BUILDDIR_WIN'
dir(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 'cmake --build . -j4'
sh 'wine64 fsfw-tests.exe' sh 'wine64 fsfw-tests.exe'
} }

0
unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake → cmake/Platform/a72_lp64_qemu.cmake
View File

3
unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake → cmake/aarch64-rtems6-gcc.cmake
View File

@ -31,6 +31,3 @@ add_compile_definitions("__STDC_VERSION__")
# make newlib behave like glib with an intercepted cmath # make newlib behave like glib with an intercepted cmath
add_compile_options("-I${CMAKE_SOURCE_DIR}/unittests/testcfg/rtems/include") 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")

0
unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake → cmake/x64-windows-msvc.cmake
View File