From d436bbce3e03d4f2487681d65f7b4da1b9c980cf Mon Sep 17 00:00:00 2001 From: Maxime Haselbauer Date: Tue, 24 Sep 2024 19:10:56 +0200 Subject: [PATCH] Fix 2605 Pass the CMAKE_PREFIX_PATH to targets --- cmake/Makefile.sample | 4 ++++ cmake/mission_build.cmake | 1 + 2 files changed, 5 insertions(+) diff --git a/cmake/Makefile.sample b/cmake/Makefile.sample index c64668b8b..a56faf17b 100644 --- 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 index fad015d03..eff36900e 100644 --- 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}