From a35ef4410bbb608fa7e9e8babaf354fe1d5e916a Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Tue, 9 Jul 2019 23:19:21 +0200 Subject: [PATCH] Update Toolchain.cmake to use BOTH for CMAKE_FIND_ROOT_PATH_MODES This is necessary if one wants to be able to use libraries or includes or programs installed locally (and not on the system of the build machine, or in CMAKE_SYSROOT, or in CMAKE_FIND_ROOT_PATH). According to cmake order for find_* functions, CMAKE_FIND_ROOT_PATH will be searched before the system of the build machine anyway, which doesn't dramatically change the current behavior. --- linux-armv7/Toolchain.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-armv7/Toolchain.cmake b/linux-armv7/Toolchain.cmake index 2a50d7c..a2d16bd 100644 --- a/linux-armv7/Toolchain.cmake +++ b/linux-armv7/Toolchain.cmake @@ -12,8 +12,8 @@ set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)