Skip to content

Commit 84e42cd

Browse files
authored
Merge pull request #9 from rmspacefish/develop
Hotfix
2 parents a2bd929 + a66e228 commit 84e42cd

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# RTEMS CMake Build Support
22

3-
This repository contains the first version of a possible RTEMS CMake build support. The intention is to provide most CMake configuration to perform cross-compiling of RTEMS applications and provide a decent starting point for developers which would like to build their RTEMS application with CMake. The support has been written as generic as possible and only required a few lines of code is the application `CMakeLists.txt` file and some necessary variables set to determine compiler information.
3+
This repository contains the first version of a possible RTEMS CMake build support. The intention is to provide most CMake configuration to perform cross-compiling of RTEMS applications and provide a decent starting point for developers which would like to build their RTEMS application with CMake. The support has been written as generic as possible and only requires a few lines of code in the application `CMakeLists.txt` file and some necessary variables set to determine compiler information.
44

55
It is assumed that the RTEMS tools and the BSPs have already been built. If you are a beginner and this is not the case, it is recommended to have a look at [this demo](https://github.com/rmspacefish/rtems-demo) or the [QuickStart](https://docs.rtems.org/branches/master/user/start/index.html) to get started with RTEMS.
66

RTEMSCompilerConfig.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ function(rtems_compiler_config RTEMS_PREFIX RTEMS_BSP)
22

33
message(STATUS "Setting up and checking RTEMS cross compile configuration..")
44

5-
65
set(RTEMS_PREFIX ${RTEMS_PREFIX} CACHE FILEPATH "RTEMS prefix")
76
set(RTEMS_BSP ${RTEMS_BSP} CACHE STRING "RTEMS BSP")
87

RTEMSPreProjectConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(NOT DEFINED RTEMS_CONFIG_DIR)
4646
endif()
4747

4848
include(${RTEMS_CONFIG_DIR}/RTEMSCompilerConfig.cmake)
49-
rtems_compiler_config(RTEMS_PREFIX RTEMS_BSP)
49+
rtems_compiler_config(${RTEMS_PREFIX} ${RTEMS_BSP})
5050

5151
include(${RTEMS_CONFIG_DIR}/RTEMSPkgConfig.cmake)
5252
rtems_pkg_config()

RTEMSToolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Finding compilers by using environment variables.
2020
###############################################################################
2121

22-
set(CMAKE_CROSSCOMPILING 1)
22+
set(CMAKE_CROSSCOMPILING TRUE)
2323
set(CMAKE_SYSTEM_NAME Generic)
2424

2525
if(NOT DEFINED ENV{RTEMS_ARCH_VERSION_NAME})

0 commit comments

Comments
 (0)