From f84c2399b8a8a34d9addd55cc7491d095d3a5ab7 Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Wed, 14 Jul 2021 19:26:42 -0400 Subject: [PATCH] SWDEV-273235 - [PAL] Ignore system headers on Linux CMake always searches system paths for specified files before resorting to the hints we give it. We should not be using elf and GL headers from /usr/include. Change-Id: I2172ce3da9cc101ced63e22d95ecc031b94f0a67 [ROCm/clr commit: a2612343d5aac9a96d5a8f2fba2ae6e1daf52ece] --- projects/clr/rocclr/cmake/FindAMD_HSA_LOADER.cmake | 3 ++- projects/clr/rocclr/cmake/FindAMD_UGL.cmake | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/cmake/FindAMD_HSA_LOADER.cmake b/projects/clr/rocclr/cmake/FindAMD_HSA_LOADER.cmake index 05c6854627..0413ea3273 100644 --- a/projects/clr/rocclr/cmake/FindAMD_HSA_LOADER.cmake +++ b/projects/clr/rocclr/cmake/FindAMD_HSA_LOADER.cmake @@ -28,7 +28,8 @@ find_path(AMD_LIBELF_INCLUDE_DIR libelf.h PATHS ${CMAKE_SOURCE_DIR}/hsail-compiler/lib/loaders/elf/utils/libelf ${CMAKE_SOURCE_DIR}/../hsail-compiler/lib/loaders/elf/utils/libelf - ${CMAKE_SOURCE_DIR}/../../hsail-compiler/lib/loaders/elf/utils/libelf) + ${CMAKE_SOURCE_DIR}/../../hsail-compiler/lib/loaders/elf/utils/libelf + NO_DEFAULT_PATH) find_path(AMD_HSAIL_INCLUDE_DIR hsa.h HINTS diff --git a/projects/clr/rocclr/cmake/FindAMD_UGL.cmake b/projects/clr/rocclr/cmake/FindAMD_UGL.cmake index 8548fec54f..1246476e9c 100644 --- a/projects/clr/rocclr/cmake/FindAMD_UGL.cmake +++ b/projects/clr/rocclr/cmake/FindAMD_UGL.cmake @@ -35,7 +35,8 @@ find_path(AMD_UGL_INCLUDE_DIR GL/glx.h ${CMAKE_SOURCE_DIR}/../drivers/drivers ${CMAKE_SOURCE_DIR}/../../drivers/drivers PATH_SUFFIXES - ugl/inc) + ugl/inc + NO_DEFAULT_PATH) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(AMD_UGL