Merge pull request #2606 from renn0xtek9:fix-2605-Pass-CMAKE_PREFIX_P…

…ATH-to-targets Fix 2605, Pass the CMAKE_PREFIX_PATH to targets
nasa · Oct 3, 2024 · 90d3ed6 · 90d3ed6
2 parents fa4088c + 31c8405
commit 90d3ed6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cmake/Makefile.sample b/cmake/Makefile.sample
@@ -115,6 +115,10 @@ ifneq ($(BUILDTYPE),)
 PREP_OPTS += -DCMAKE_BUILD_TYPE=$(BUILDTYPE)
 endif
 
+ifneq ($(CMAKE_PREFIX_PATH),)
+PREP_OPTS += -DCMAKE_PREFIX_PATH=$(CMAKE_PREFIX_PATH)
+endif
+
 all:
 	$(MAKE) --no-print-directory -C "$(O)" mission-all
 

diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake
@@ -603,6 +603,7 @@ function(process_arch TARGETSYSTEM)
         -DMISSION_BINARY_DIR=${MISSION_BINARY_DIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
         -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=${CMAKE_EXPORT_COMPILE_COMMANDS}
         -DCFE_EDS_ENABLED_BUILD:BOOL=${CFE_EDS_ENABLED_BUILD}
         ${SELECTED_TOOLCHAIN_FILE}