30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
||
|
|
Date: Fri, 2 Jun 2023 14:13:00 +0200
|
||
|
|
Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH
|
||
|
|
instead of replacing it
|
||
|
|
|
||
|
|
Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto
|
||
|
|
(which is a major cross compiling framework).
|
||
|
|
|
||
|
|
Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808]
|
||
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||
|
|
|
||
|
|
---
|
||
|
|
scripts/CMakeLists.txt | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
||
|
|
index 5b979d43..19a58bf9 100644
|
||
|
|
--- a/scripts/CMakeLists.txt
|
||
|
|
+++ b/scripts/CMakeLists.txt
|
||
|
|
@@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (CMAKE_CROSSCOMPILING)
|
||
|
|
- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
|
||
|
|
+ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
|
||
|
|
else()
|
||
|
|
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
|
||
|
|
endif()
|