Skip to content

Commit 46d4298

Browse files
authored
Merge pull request #6 from rmspacefish/develop
RTEMS_PATH replaced by RTEMS
2 parents 812a3c8 + f6fb08c commit 46d4298

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
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 aupport. 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.
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.
44

55
This is still a prototype. Simple applications have been tested, but it has not been attempted to link an additional library for an application yet.
66

RTEMSConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# 3. RTEMS_TOOLS:
2828
# The user can provide this filepath variable if the RTEMS tools path is
2929
# not equal to the RTEMS prefix.
30-
# 4. RTEMS_PATH:
30+
# 4. RTEMS:
3131
# The user can provide this filepath variable if the RTEMS path (containg
3232
# the BSPs) is not equal to the RTEMS prefix.
3333
# 5. RTEMS_VERBOSE:

RTEMSGeneric.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# 2. RTEMS_TOOLS:
2525
# The user can provide this filepath variable if the RTEMS tools path is
2626
# not equal to the RTEMS prefix.
27-
# 3. RTEMS_PATH:
27+
# 3. RTEMS:
2828
# The user can provide this filepath variable if the RTEMS path (containig
2929
# the BSPs) is not equal to the RTEMS prefix.
3030

@@ -36,7 +36,7 @@ list(LENGTH EXTRA_RTEMS_ARGS NUM_EXTRA_RTEMS_ARGS)
3636
if (${NUM_EXTRA_RTEMS_ARGS} EQUAL 1)
3737
# This only works for one optional arguments! Need to write list to
3838
# single variables if this is extended.
39-
set(RTEMS_PATH ${EXTRA_RTEMS_ARGS})
39+
set(RTEMS ${EXTRA_RTEMS_ARGS})
4040
endif()
4141

4242
if(NOT RTEMS_PREFIX)
@@ -60,13 +60,13 @@ set(RTEMS_INSTALL
6060
CACHE FILEPATH "RTEMS install destination"
6161
)
6262

63-
if(NOT RTEMS_PATH)
63+
if(NOT RTEMS)
6464
message(STATUS
6565
"RTEMS path was not specified and was set to RTEMS prefix."
6666
)
67-
set(RTEMS_PATH ${RTEMS_PREFIX} CACHE FILEPATH "RTEMS folder")
67+
set(RTEMS ${RTEMS_PREFIX} CACHE FILEPATH "RTEMS folder")
6868
#else()
69-
# set(RTEMS_PATH ${RTEMS_PATH} CACHE FILEPATH "RTEMS path folder")
69+
# set(RTEMS ${RTEMS} CACHE FILEPATH "RTEMS path folder")
7070
endif()
7171

7272
if(NOT RTEMS_TOOLS)
@@ -114,7 +114,7 @@ endif()
114114
set(RTEMS_ARCH_LIB_PATH "${RTEMS_TOOLS}/${RTEMS_ARCH_VERSION_NAME}/lib")
115115
set(RTEMS_TOOLS_LIB_PATH "${RTEMS_TOOLS}/lib")
116116

117-
set(RTEMS_BSP_PATH "${RTEMS_PATH}/${RTEMS_ARCH_VERSION_NAME}/${RTEMS_BSP_NAME}")
117+
set(RTEMS_BSP_PATH "${RTEMS}/${RTEMS_ARCH_VERSION_NAME}/${RTEMS_BSP_NAME}")
118118
if(NOT IS_DIRECTORY ${RTEMS_BSP_PATH})
119119
message(STATUS
120120
"Supplied or autodetermined BSP path "
@@ -213,7 +213,7 @@ message(STATUS "RTEMS prefix: ${RTEMS_PREFIX}")
213213
message(STATUS "RTEMS tools path: ${RTEMS_TOOLS}")
214214
message(STATUS "RTEMS BSP pair: ${RTEMS_BSP}")
215215
message(STATUS "RTEMS architecture tools path: "
216-
"${RTEMS_PATH}/${RTEMS_ARCH_VERSION_NAME}")
216+
"${RTEMS}/${RTEMS_ARCH_VERSION_NAME}")
217217
message(STATUS "RTEMS BSP library path: ${RTEMS_BSP_LIB_PATH}")
218218
message(STATUS "RTEMS BSP include path: ${RTEMS_BSP_INC_PATH}")
219219
message(STATUS "RTEMS install target: ${RTEMS_INSTALL}")

0 commit comments

Comments
 (0)