Merge pull request #10 from rmspacefish/develop

RTEMS_TOOLS bugfix
robamu-org · Jan 2, 2021 · 7578ce4 · 7578ce4
2 parents 84e42cd + cb86a0c
commit 7578ce4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/RTEMSPreProjectConfig.cmake b/RTEMSPreProjectConfig.cmake
@@ -54,6 +54,9 @@ rtems_pkg_config()
 set(ENV{RTEMS_PREFIX} ${RTEMS_PREFIX})
 set(ENV{RTEMS_BSP} ${RTEMS_BSP})
 set(ENV{RTEMS_VERSION} ${RTEMS_VERSION})
+if(NOT DEFINED ENV{RTEMS_TOOLS})
+	set(ENV{RTEMS_TOOLS} ${RTEMS_TOOLS})
+endif()
 set(ENV{RTEMS_BSP_NAME} ${RTEMS_BSP_NAME})
 set(ENV{RTEMS_ARCH_NAME} ${RTEMS_ARCH_NAME})
 set(ENV{RTEMS_ARCH_VERSION_NAME} ${RTEMS_ARCH_VERSION_NAME})

diff --git a/RTEMSToolchain.cmake b/RTEMSToolchain.cmake
@@ -36,7 +36,7 @@ endif()
 
 set(RTEMS_BIN_PATH "$ENV{RTEMS_TOOLS}/bin")
 if(NOT IS_DIRECTORY "${RTEMS_BIN_PATH}")
-	message(FATAL_ERROR "RTEMS binaries folder not found at ${RTEMS_TOOLS}/bin")
+	message(FATAL_ERROR "RTEMS binaries folder not found at ${RTEMS_BIN_PATH}")
 endif()
 
 list(APPEND CMAKE_PREFIX_PATH "${RTEMS_TOOLS}")