git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 9060e916ca05d34b56c62f2be0b4a77dd104e2aa Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex@linutronix.de>
   3 Date: Fri, 2 Jun 2023 14:13:00 +0200
   4 Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH
   5  instead of replacing it
   6
   7 Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto
   8 (which is a major cross compiling framework).
   9
  10 Upstream-Status: Submitted [https://github.com/KhronosGroup/Vulkan-Tools/pull/808]
  11 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  12
  13 ---
  14  scripts/CMakeLists.txt | 2 +-
  15  1 file changed, 1 insertion(+), 1 deletion(-)
  16
  17 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
  18 index 5b979d43..19a58bf9 100644
  19 --- a/scripts/CMakeLists.txt
  20 +++ b/scripts/CMakeLists.txt
  21 @@ -114,7 +114,7 @@ if (MOLTENVK_REPO_ROOT)
  22  endif()
  23
  24  if (CMAKE_CROSSCOMPILING)
  25 -    set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
  26 +    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
  27  else()
  28      set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
  29  endif()