Skip to content

Commit 31c8405

Browse files
committed
Fix #2605 Pass the CMAKE_PREFIX_PATH to targets
1 parent 561ff53 commit 31c8405

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

cmake/Makefile.sample

+4
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ ifneq ($(BUILDTYPE),)
115115
PREP_OPTS += -DCMAKE_BUILD_TYPE=$(BUILDTYPE)
116116
endif
117117

118+
ifneq ($(CMAKE_PREFIX_PATH),)
119+
PREP_OPTS += -DCMAKE_PREFIX_PATH=$(CMAKE_PREFIX_PATH)
120+
endif
121+
118122
all:
119123
$(MAKE) --no-print-directory -C "$(O)" mission-all
120124

cmake/mission_build.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ function(process_arch TARGETSYSTEM)
603603
-DMISSION_BINARY_DIR=${MISSION_BINARY_DIR}
604604
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
605605
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
606+
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
606607
-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=${CMAKE_EXPORT_COMPILE_COMMANDS}
607608
-DCFE_EDS_ENABLED_BUILD:BOOL=${CFE_EDS_ENABLED_BUILD}
608609
${SELECTED_TOOLCHAIN_FILE}

0 commit comments

Comments
 (0)