Skip to content

Commit 61eb819

Browse files
LeStarchLeStarch
authored
lestarch: refactoring toolchains to properly set and use CMAKE_SYSTEM_NAME (nasa#686)
1 parent eebef10 commit 61eb819

File tree

18 files changed

+68
-124
lines changed

18 files changed

+68
-124
lines changed

‎Drv/LinuxGpioDriver/CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ if(NOT DEFINED FPRIME_USE_STUBBED_DRIVERS OR FPRIME_USE_STUBBED_DRIVERS)
1111
"${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriverComponentImplCommon.cpp"
1212
"${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriverComponentImplStub.cpp"
1313
)
14-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf")
14+
register_fprime_module()
15+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
1516
set(SOURCE_FILES
1617
"${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriverComponentAi.xml"
1718
"${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriverComponentImplCommon.cpp"
1819
"${CMAKE_CURRENT_LIST_DIR}/LinuxGpioDriverComponentImpl.cpp"
1920
)
21+
register_fprime_module()
2022
else()
21-
message(FATAL_ERROR "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Consider using -DFPRIME_USE_STUBBED_DRIVERS=ON")
23+
message(STATUS "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Skipping.")
2224
endif()
2325

24-
register_fprime_module()
26+

‎Drv/LinuxI2cDriver/CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ if(NOT DEFINED FPRIME_USE_STUBBED_DRIVERS OR FPRIME_USE_STUBBED_DRIVERS)
1111
"${CMAKE_CURRENT_LIST_DIR}/LinuxI2cDriverComponentAi.xml"
1212
"${CMAKE_CURRENT_LIST_DIR}/LinuxI2cDriverComponentImplStub.cpp"
1313
)
14-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf")
14+
register_fprime_module()
15+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
1516
set(SOURCE_FILES
1617
"${CMAKE_CURRENT_LIST_DIR}/LinuxI2cDriverComponentAi.xml"
1718
"${CMAKE_CURRENT_LIST_DIR}/LinuxI2cDriverComponentImpl.cpp"
1819
)
20+
register_fprime_module()
1921
else()
20-
message(FATAL_ERROR "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Consider using -DFPRIME_USE_STUBBED_DRIVERS=ON")
22+
message(STATUS "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Skipping.")
2123
endif()
2224

23-
register_fprime_module()
25+

‎Drv/LinuxSerialDriver/CMakeLists.txt

+5-8
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@
55
# MOD_DEPS: (optional) module dependencies
66
#
77
####
8-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
8+
set(MOD_DEPS Os)
9+
10+
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
911
set(SOURCE_FILES
1012
"${CMAKE_CURRENT_LIST_DIR}/LinuxSerialDriverComponentAi.xml"
1113
"${CMAKE_CURRENT_LIST_DIR}/LinuxSerialDriverComponentImplCommon.cpp"
1214
"${CMAKE_CURRENT_LIST_DIR}/LinuxSerialDriverComponentImpl.cpp"
1315
)
16+
register_fprime_module()
1417
else()
15-
message(FATAL_ERROR "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}.")
18+
message(STATUS "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Skipping.")
1619
endif()
1720

18-
set(MOD_DEPS
19-
Os
20-
)
21-
22-
register_fprime_module()
23-
2421
### UTs ###
2522
# Note: this UT expects user input
2623
#set(UT_MOD_DEPS

‎Drv/LinuxSpiDriver/CMakeLists.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ if(NOT DEFINED FPRIME_USE_STUBBED_DRIVERS OR FPRIME_USE_STUBBED_DRIVERS)
1111
"${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriverComponentImplCommon.cpp"
1212
"${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriverComponentImplStub.cpp"
1313
)
14-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf")
14+
register_fprime_module()
15+
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
1516
set(SOURCE_FILES
1617
"${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriverComponentAi.xml"
1718
"${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriverComponentImplCommon.cpp"
1819
"${CMAKE_CURRENT_LIST_DIR}/LinuxSpiDriverComponentImpl.cpp"
1920
)
21+
register_fprime_module()
2022
else()
21-
message(FATAL_ERROR "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Consider using -DFPRIME_USE_STUBBED_DRIVERS=ON")
23+
message(STATUS "Cannot use ${CMAKE_CURRENT_LIST_DIR} with platform ${CMAKE_SYSTEM_NAME}. Skipping.")
2224
endif()
2325

24-
register_fprime_module()

‎Os/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
5959
"${CMAKE_CURRENT_LIST_DIR}/MacOs/IPCQueueStub.cpp"
6060
)
6161
# Linux IPC queues implementation
62-
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf")
62+
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
6363
list(APPEND SOURCE_FILES
6464
"${CMAKE_CURRENT_LIST_DIR}/Posix/IPCQueue.cpp"
6565
"${CMAKE_CURRENT_LIST_DIR}/Posix/LocklessQueue.cpp"

‎Svc/LinuxTimer/CMakeLists.txt

-12
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
1919
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplTimerFd.cpp"
2020
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
2121
)
22-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "CygWin")
23-
set(SOURCE_FILES
24-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentAi.xml"
25-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplTaskDelay.cpp"
26-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
27-
)
28-
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "arm-linux-gnueabihf")
29-
set(SOURCE_FILES
30-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentAi.xml"
31-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplTimerFd.cpp"
32-
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentImplCommon.cpp"
33-
)
3422
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "RTEMS5")
3523
set(SOURCE_FILES
3624
"${CMAKE_CURRENT_LIST_DIR}/LinuxTimerComponentAi.xml"

‎cmake/Options.cmake

-10
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@ endif()
154154
# e.g. `-DCMAKE_TOOLCHAIN_FILE=/path/to/cmake/toolchain`
155155
####
156156

157-
####
158-
# `PLATFORM:`
159-
#
160-
# Specifies the platform used when building the F prime using the CMake system. See:
161-
# [platform.md](platform.md) for more information. Default: automatically detect platform file.
162-
#
163-
# e.g. `-DPLATFORM=/path/to/platform/cmake`
164-
####
165-
166-
167157
####
168158
# Locations `FPRIME_FRAMEWORK_PATH`, `FPRIME_PROJECT_ROOT`, `FPRIME_LIBRARY_LOCATIONS`
169159
# `FPRIME_AC_CONSTANTS_FILE`, and `FPRIME_CONFIG_DIR`:

‎cmake/googletest-download/CMakeLists.txt.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ExternalProject_Add(googletest
77
GIT_REPOSITORY https://github.com/google/googletest.git
88
GIT_TAG a3460d1
99
SOURCE_DIR "${FPRIME_FRAMEWORK_PATH}/gtest/googletest-src"
10-
BINARY_DIR "${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${PLATFORM}"
10+
BINARY_DIR "${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${TOOLCHAIN_NAME}"
1111
CONFIGURE_COMMAND ""
1212
BUILD_COMMAND ""
1313
INSTALL_COMMAND ""

‎cmake/googletest-download/googletest.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Download and unpack googletest at configure time if it doesn't exit already
2-
if (NOT IS_DIRECTORY "${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${PLATFORM}/googletest")
2+
if (NOT IS_DIRECTORY "${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${TOOLCHAIN_NAME}/googletest")
33
configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in" googletest-download/CMakeLists.txt)
44
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
55
RESULT_VARIABLE result
@@ -21,7 +21,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
2121
# Add googletest directly to our build. This defines
2222
# the gtest and gtest_main targets.
2323
add_subdirectory(${FPRIME_FRAMEWORK_PATH}/gtest/googletest-src
24-
${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${PLATFORM}
24+
${FPRIME_FRAMEWORK_PATH}/gtest/googletest-build-${TOOLCHAIN_NAME}
2525
EXCLUDE_FROM_ALL)
2626

2727
# The gtest/gtest_main targets carry header search path

‎cmake/platform/CMakeLists.txt

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
11
####
22
# platforms:
33
#
4-
# Platforms in F prime's CMake system setup f prime specific items. This file loads those platforms
4+
# Platforms in F prime's CMake system setup f prime specific items w.r.t the OS. This file loads those platforms
55
# file and uses it to setup F prime's build. See: [Platform Template](./platform/platform-template.md) for how to
66
# generate these files.
77
#
88
####
9-
if (NOT DEFINED PLATFORM)
10-
set(PLATFORM "${CMAKE_SYSTEM_NAME}")
9+
# Basic definitions
10+
get_filename_component(TOOLCHAIN_NAME "${CMAKE_TOOLCHAIN_FILE}" NAME_WE)
11+
# Setup fallback toolchain name
12+
if ("${TOOLCHAIN_NAME}" STREQUAL "")
13+
set(TOOLCHAIN_NAME "${CMAKE_SYSTEM_NAME}")
1114
endif()
1215

1316
# Include platform file based on system name
14-
message(STATUS "Target build platform: ${PLATFORM}")
17+
message(STATUS "Target build toolchain/platform: ${TOOLCHAIN_NAME}/${CMAKE_SYSTEM_NAME}")
1518

1619
# Output directories
17-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${PLATFORM}")
18-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${PLATFORM}")
19-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${PLATFORM}")
20+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${TOOLCHAIN_NAME}")
21+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${TOOLCHAIN_NAME}")
22+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${TOOLCHAIN_NAME}")
23+
set(EXPECTED_PLATFORM_FILE "")
2024

21-
string(REGEX REPLACE ".cmake" "" PLATFORM_NO_SUFFIX "${PLATFORM}")
22-
23-
get_filename_component(TOOLCHAIN_DIR "${CMAKE_TOOLCHAIN_FILE}" DIRECTORY)
24-
if ("${TOOLCHAIN_DIR}" STREQUAL "")
25-
set(TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}")
26-
endif()
27-
set(EXPECTED_PLATFORM_FILE "${TOOLCHAIN_DIR}/../platform/${PLATFORM_NO_SUFFIX}.cmake")
28-
# Include host machine settings
29-
if (EXISTS "${EXPECTED_PLATFORM_FILE}")
30-
message(STATUS "Including ${EXPECTED_PLATFORM_FILE}")
31-
include("${EXPECTED_PLATFORM_FILE}")
32-
else()
33-
message(FATAL_ERROR "\n[F-PRIME] No platform config for '${PLATFORM_NO_SUFFIX}'. Please create: '${EXPECTED_PLATFORM_FILE}'\n")
25+
# Loop over locations of platform files in order: project, libraries, then framework
26+
foreach(ROOT ${FPRIME_PROJECT_ROOT};${FPRIME_LIBRARY_LOCATIONS};${FPRIME_FRAMEWORK_PATH} )
27+
set(EXPECTED_PLATFORM_FILE "${ROOT}/cmake/platform/${CMAKE_SYSTEM_NAME}.cmake")
28+
# Include host machine settings
29+
if (EXISTS "${EXPECTED_PLATFORM_FILE}")
30+
message(STATUS "Including ${EXPECTED_PLATFORM_FILE}")
31+
include("${EXPECTED_PLATFORM_FILE}")
32+
break()
33+
endif()
34+
endforeach()
35+
# Ensure the last attempt for the platform file was successful, otherwise error.
36+
if (NOT EXISTS "${EXPECTED_PLATFORM_FILE}")
37+
message(FATAL_ERROR "\n[F-PRIME] No platform config for '${CMAKE_SYSTEM_NAME}'. Please create: '${CMAKE_SYSTEM_NAME}.cmake'\n")
3438
endif()

‎cmake/platform/Linux-common.cmake

-13
This file was deleted.

‎cmake/platform/Linux.cmake

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
#
44
# Linux platform file for standard linux targets. Merely defers to [./Linux-common.cmake](Linux-common.cmake).
55
####
6-
7-
# Set platform default for stubbed drivers
8-
if (NOT DEFINED FPRIME_USE_STUBBED_DRIVERS)
9-
set(FPRIME_USE_STUBBED_DRIVERS ON)
10-
endif()
11-
126
# Set platform default for baremetal scheduler drivers
137
if (NOT DEFINED FPRIME_USE_BAREMETAL_SCHEDULER)
148
set(FPRIME_USE_BAREMETAL_SCHEDULE OFF)
@@ -17,4 +11,8 @@ if (NOT DEFINED FPRIME_USE_BAREMETAL_SCHEDULER)
1711
endif()
1812

1913
# Use common linux setup
20-
include("${CMAKE_CURRENT_LIST_DIR}/Linux-common.cmake")
14+
add_definitions(-DTGT_OS_TYPE_LINUX)
15+
set(FPRIME_USE_POSIX ON)
16+
17+
# Add Linux specific headers into the system
18+
include_directories(SYSTEM "${FPRIME_FRAMEWORK_PATH}/Fw/Types/Linux")

‎cmake/platform/arm-linux-gnueabihf.cmake

-21
This file was deleted.

‎cmake/platform/platform.cmake.template

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@
1717
# in the chosen Toolchain file, or by the CMake system itself. However, if the user wants to control
1818
# which platform file is used, the load is specified by the following rules:
1919
#
20-
# If the user specifies the platform from the command line using the command line option
21-
# `-DPLATFORM=<NAME>` then that platform file will be used e.g. `-DPLATFORM=Darwin` will load the
22-
# Darwin.cmake regardless of the Host system. This is usually used only in the case of running UTs.
23-
#
2420
# If the user specifies a CMake Toolchain file, then the platform file `${CMAKE_SYSTEM_NAME}.cmake`
25-
# will be used. `${CMAKE_SYSTEM_NAME}` is set in the toolchain file.
21+
# will be used. `${CMAKE_SYSTEM_NAME}` is set in the toolchain file and is typically set to a name like Linux, or Darwin
22+
# but may be more specific if required.
2623
#
27-
# Otherwise, CMake sets the `${CMAKE_SYSTEM_NAME}` to be that of the Host system, and that platform
24+
# Otherwise, CMake sets the `${CMAKE_SYSTEM_NAME}` automatically to be that of the Host system, and that platform
2825
# will be used. e.g. when building on Linux, the platform file "Linux.cmake" will be used.
2926
#
3027
# ### Filling In CMake Platform by Example ###
@@ -63,8 +60,12 @@ set(CMAKE_CXX_FLAGS
6360

6461
# STEP 4: Specify that a thread package should be searched in the toolchain
6562
# directory. NOTE: when running without threads, remove this line.
66-
message(STATUS "Requiring thread library")
67-
FIND_PACKAGE ( Threads REQUIRED )
63+
# Here there is a check for the using baremetal scheduler
64+
if (NOT DEFINED FPRIME_USE_BAREMETAL_SCHEDULER)
65+
set(FPRIME_USE_BAREMETAL_SCHEDULE OFF)
66+
message(STATUS "Requiring thread library")
67+
FIND_PACKAGE ( Threads REQUIRED )
68+
endif()
6869

6970
# STEP 5: Specify a directory containing the "StandardTypes.hpp" headers, as well
7071
# as other system headers. Other global headers can be placed here.

‎cmake/target/dict.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function(dictgen MODULE_NAME AI_XML DEPS)
2222
get_filename_component(DICT_XML_NAME ${DICT_XML} NAME)
2323
get_filename_component(ID_CSV_XML_NAME ${ID_CSV_XML} NAME)
2424
get_filename_component(ID_LOG_XML_NAME ${ID_LOG_XML} NAME)
25-
set(DICT_ROOT "${FPRIME_INSTALL_DEST}/${PLATFORM}/dict")
25+
set(DICT_ROOT "${FPRIME_INSTALL_DEST}/${TOOLCHAIN_NAME}/dict")
2626
set(DICTIONARY_OUTPUT_FILE "${DICT_ROOT}/${DICT_XML_NAME}")
2727

2828
add_custom_command(

‎cmake/target/package_gen.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ function(add_module_target MODULE_NAME TARGET_NAME GLOBAL_TARGET_NAME AC_INPUTS
5151
if ("${FPRIME_OBJECT_TYPE}" STREQUAL "Library")
5252
add_custom_target(
5353
${TARGET_NAME}
54-
COMMAND ${CMAKE_COMMAND} -E make_directory "${FPRIME_INSTALL_DEST}/${PLATFORM}/lib/static/"
55-
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${MODULE_NAME}> "${FPRIME_INSTALL_DEST}/${PLATFORM}/lib/static/"
54+
COMMAND ${CMAKE_COMMAND} -E make_directory "${FPRIME_INSTALL_DEST}/${TOOLCHAIN_NAME}/lib/static/"
55+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${MODULE_NAME}> "${FPRIME_INSTALL_DEST}/${TOOLCHAIN_NAME}/lib/static/"
5656
DEPENDS ${PKG_DEPS}
5757
)
5858
elseif("${FPRIME_OBJECT_TYPE}" STREQUAL "Executable")
5959
add_custom_target(
6060
${TARGET_NAME}
61-
COMMAND ${CMAKE_COMMAND} -E make_directory "${FPRIME_INSTALL_DEST}/${PLATFORM}/bin/"
62-
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${MODULE_NAME}> "${FPRIME_INSTALL_DEST}/${PLATFORM}/bin/"
61+
COMMAND ${CMAKE_COMMAND} -E make_directory "${FPRIME_INSTALL_DEST}/${TOOLCHAIN_NAME}/bin/"
62+
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${MODULE_NAME}> "${FPRIME_INSTALL_DEST}/${TOOLCHAIN_NAME}/bin/"
6363
DEPENDS ${PKG_DEPS}
6464
)
6565
add_dependencies("${GLOBAL_TARGET_NAME}" "${TARGET_NAME}")

‎cmake/toolchain/raspberrypi.cmake

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
#
1212
# e.g. should the user install the tools in ``/home/user1` then the environment variable might be set using
1313
# `export RPI_TOOLCHAIN_DIR=/home/user/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/`
14-
#
15-
# **Note:** this toolchain file sets the system name to `arm-linux-gnueabihf` to be similar to other raspberry pi
16-
# toolchain files while providing a cleaner name of `raspberrypi`. Its parallel platform file is therefore named
17-
# `arm-linux-gnueabihf.cmake` in the platforms directory.
1814
####
1915
# Set system name
20-
set(CMAKE_SYSTEM_NAME "arm-linux-gnueabihf")
16+
set(CMAKE_SYSTEM_NAME "Linux")
17+
set(CMAKE_SYSTEM_PROCESSOR "arm")
2118

2219
# Location of pi toolchain
2320
set(RPI_TOOLCHAIN "$ENV{RPI_TOOLCHAIN_DIR}")

‎docs/UsersGuide/cmake/cmake-api.md

-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ define types and headers needed for F´ for any embedded system they desire.
2424
[Platform Template](../api/cmake/platform/platform-template.md): Platform file template documentation
2525
[Linux](../api/cmake/platform/Linux.md): Linux platform support
2626
[Darwin](../api/cmake/platform/Darwin.md): Darwin (macOS) platform support
27-
[arm-linux-gnueabihf](../api/cmake/platform/arm-linux-gnueabihf.md): Raspberry PI platform support
2827
[rtems5](../api/cmake/platform/rtems5.md): RTEMS 5 initial support
29-
[Linux-common](./platform/Linux-common.md): Common Linux platform support included above
3028
[CMakeLists.txt](./platform/CMakeLists.txt.md)
3129

3230
## Target Documentation

0 commit comments

Comments
 (0)