From 02dcaef714a3aa5ee4e665bc19004d3e0463e615 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Thu, 18 Jul 2019 12:02:52 +0200 Subject: [PATCH] Update Toolchain.cmake to use BOTH for CMAKE_FIND_ROOT_PATH_MODES For android-arm, android-arm64 and linux-armv6 --- android-arm/Toolchain.cmake | 4 ++-- android-arm64/Toolchain.cmake | 4 ++-- linux-armv6/Toolchain.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake index 5b64c58..0d11f7c 100644 --- a/android-arm/Toolchain.cmake +++ b/android-arm/Toolchain.cmake @@ -12,8 +12,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) 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 $ENV{CROSS_ROOT}/sysroot) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm) diff --git a/android-arm64/Toolchain.cmake b/android-arm64/Toolchain.cmake index 152ff74..b06a843 100644 --- a/android-arm64/Toolchain.cmake +++ b/android-arm64/Toolchain.cmake @@ -12,8 +12,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) 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 $ENV{CROSS_ROOT}/sysroot) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm) diff --git a/linux-armv6/Toolchain.cmake b/linux-armv6/Toolchain.cmake index 39508d6..623066b 100644 --- a/linux-armv6/Toolchain.cmake +++ b/linux-armv6/Toolchain.cmake @@ -10,7 +10,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr) 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_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)