Skip to content

Commit 7578ce4

Browse files
authored
Merge pull request #10 from rmspacefish/develop
RTEMS_TOOLS bugfix
2 parents 84e42cd + cb86a0c commit 7578ce4

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

RTEMSPreProjectConfig.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ rtems_pkg_config()
5454
set(ENV{RTEMS_PREFIX} ${RTEMS_PREFIX})
5555
set(ENV{RTEMS_BSP} ${RTEMS_BSP})
5656
set(ENV{RTEMS_VERSION} ${RTEMS_VERSION})
57+
if(NOT DEFINED ENV{RTEMS_TOOLS})
58+
set(ENV{RTEMS_TOOLS} ${RTEMS_TOOLS})
59+
endif()
5760
set(ENV{RTEMS_BSP_NAME} ${RTEMS_BSP_NAME})
5861
set(ENV{RTEMS_ARCH_NAME} ${RTEMS_ARCH_NAME})
5962
set(ENV{RTEMS_ARCH_VERSION_NAME} ${RTEMS_ARCH_VERSION_NAME})

RTEMSToolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif()
3636

3737
set(RTEMS_BIN_PATH "$ENV{RTEMS_TOOLS}/bin")
3838
if(NOT IS_DIRECTORY "${RTEMS_BIN_PATH}")
39-
message(FATAL_ERROR "RTEMS binaries folder not found at ${RTEMS_TOOLS}/bin")
39+
message(FATAL_ERROR "RTEMS binaries folder not found at ${RTEMS_BIN_PATH}")
4040
endif()
4141

4242
list(APPEND CMAKE_PREFIX_PATH "${RTEMS_TOOLS}")

0 commit comments

Comments
 (0)