From 8388e2be3ae5c2b1b5522c1a0c3f74d95beedd2e Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 11 Oct 2019 18:36:51 +0200 Subject: [PATCH] Change cmake_find_root_path_mode to BOTH for remaining linux cross-compiling images. --- linux-arm64/Toolchain.cmake | 4 ++-- linux-armv5-musl/Toolchain.cmake | 4 ++-- linux-armv5/Toolchain.cmake | 4 ++-- linux-armv7a/Toolchain.cmake | 4 ++-- linux-mips/Toolchain.cmake | 4 ++-- linux-mipsel/Toolchain.cmake | 4 ++-- linux-s390x/Toolchain.cmake | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/linux-arm64/Toolchain.cmake b/linux-arm64/Toolchain.cmake index b4b745c..2b08a67 100644 --- a/linux-arm64/Toolchain.cmake +++ b/linux-arm64/Toolchain.cmake @@ -13,8 +13,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-aarch64) diff --git a/linux-armv5-musl/Toolchain.cmake b/linux-armv5-musl/Toolchain.cmake index 83b08bb..5389902 100755 --- a/linux-armv5-musl/Toolchain.cmake +++ b/linux-armv5-musl/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) diff --git a/linux-armv5/Toolchain.cmake b/linux-armv5/Toolchain.cmake index 755c7c8..8943221 100644 --- a/linux-armv5/Toolchain.cmake +++ b/linux-armv5/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) diff --git a/linux-armv7a/Toolchain.cmake b/linux-armv7a/Toolchain.cmake index 72c9ba4..ec26650 100644 --- a/linux-armv7a/Toolchain.cmake +++ b/linux-armv7a/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) diff --git a/linux-mips/Toolchain.cmake b/linux-mips/Toolchain.cmake index 3c49933..3f93f2f 100644 --- a/linux-mips/Toolchain.cmake +++ b/linux-mips/Toolchain.cmake @@ -11,8 +11,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) 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-mips) diff --git a/linux-mipsel/Toolchain.cmake b/linux-mipsel/Toolchain.cmake index 70b8a32..93f8129 100644 --- a/linux-mipsel/Toolchain.cmake +++ b/linux-mipsel/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-mipsel) diff --git a/linux-s390x/Toolchain.cmake b/linux-s390x/Toolchain.cmake index 4a26d59..2fffdd9 100644 --- a/linux-s390x/Toolchain.cmake +++ b/linux-s390x/Toolchain.cmake @@ -11,8 +11,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) 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-s390x)