From 6adabb059a684bb4e744b9b6e2bd1172d6a36563 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Thu, 19 Jan 2023 16:27:10 +0100 Subject: [PATCH] fixing rtems cmake config --- .../testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake | 2 +- ...oolchain.cmake => aarch64-rtems6-toolchain.cmake} | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) rename cmake/Platform/aarch64-rtems6.cmake => unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake (60%) rename unittests/testcfg/rtems/cmake/{rtems-qemu-toolchain.cmake => aarch64-rtems6-toolchain.cmake} (74%) diff --git a/cmake/Platform/aarch64-rtems6.cmake b/unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake similarity index 60% rename from cmake/Platform/aarch64-rtems6.cmake rename to unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake index 1d6b84007..3d5b74959 100644 --- a/cmake/Platform/aarch64-rtems6.cmake +++ b/unittests/testcfg/rtems/cmake/Platform/a72_lp64_qemu.cmake @@ -1,3 +1,3 @@ -add_compile_options("-mcpu=cortex-a72" "-I/opt/rtems/6/aarch64-rtems6/a72_lp64_qemu/lib/include" "-I/home/mohr/data/git/fsfw/unittests/testcfg/rtems/include") +add_compile_options("-mcpu=cortex-a72" "-I/opt/rtems/6/aarch64-rtems6/a72_lp64_qemu/lib/include" "-I${CMAKE_SOURCE_DIR}/unittests/testcfg/rtems/include") add_link_options("-B/opt/rtems/6/aarch64-rtems6/a72_lp64_qemu/lib" "-qrtems") diff --git a/unittests/testcfg/rtems/cmake/rtems-qemu-toolchain.cmake b/unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake similarity index 74% rename from unittests/testcfg/rtems/cmake/rtems-qemu-toolchain.cmake rename to unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake index b75ca5d0d..34f2a1409 100644 --- a/unittests/testcfg/rtems/cmake/rtems-qemu-toolchain.cmake +++ b/unittests/testcfg/rtems/cmake/aarch64-rtems6-toolchain.cmake @@ -1,5 +1,5 @@ # the name of the target operating system -set(CMAKE_SYSTEM_NAME aarch64-rtems6) +set(CMAKE_SYSTEM_NAME a72_lp64_qemu) set(CMAKE_SYSTEM_PROCESSOR a72) @@ -10,10 +10,6 @@ set(CMAKE_CXX_COMPILER aarch64-rtems6-g++) set(CMAKE_C_COMPILER_WORKS 1) set(CMAKE_CXX_COMPILER_WORKS 1) -# where is the target environment located -#set(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc -# /home/alex/mingw-install) - # adjust the default behavior of the FIND_XXX() commands: # search programs in the host environment set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) @@ -21,3 +17,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # search headers and libraries in the target environment set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# supress errors +add_compile_definitions("__STDC_VERSION__") + +list(APPEND CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/unittests/testcfg/rtems/cmake")