diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bf2329d..cd4d6e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,7 +106,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake index c54583e..f254205 100644 --- a/android-arm/Toolchain.cmake +++ b/android-arm/Toolchain.cmake @@ -15,7 +15,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_EXE_LINKER_FLAGS "-llog") set(CMAKE_SHARED_LINKER_FLAGS "-llog") -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/android-arm64/Toolchain.cmake b/android-arm64/Toolchain.cmake index 25974c5..9aa7308 100644 --- a/android-arm64/Toolchain.cmake +++ b/android-arm64/Toolchain.cmake @@ -14,7 +14,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_EXE_LINKER_FLAGS "-llog") set(CMAKE_SHARED_LINKER_FLAGS "-llog") -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/android-x86/Toolchain.cmake b/android-x86/Toolchain.cmake index 8ae0118..7f348a8 100644 --- a/android-x86/Toolchain.cmake +++ b/android-x86/Toolchain.cmake @@ -14,7 +14,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_EXE_LINKER_FLAGS "-llog") set(CMAKE_SHARED_LINKER_FLAGS "-llog") -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/android-x86_64/Toolchain.cmake b/android-x86_64/Toolchain.cmake index fe3a440..b83cb1f 100644 --- a/android-x86_64/Toolchain.cmake +++ b/android-x86_64/Toolchain.cmake @@ -14,7 +14,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_EXE_LINKER_FLAGS "-llog") set(CMAKE_SHARED_LINKER_FLAGS "-llog") -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/bare-armv7emhf-nano_newlib/Toolchain.cmake b/bare-armv7emhf-nano_newlib/Toolchain.cmake index 6497e4b..19d63ef 100644 --- a/bare-armv7emhf-nano_newlib/Toolchain.cmake +++ b/bare-armv7emhf-nano_newlib/Toolchain.cmake @@ -10,7 +10,7 @@ set(CMAKE_CXX_COMPILER $ENV{CXX}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-arm64-full/Toolchain.cmake b/linux-arm64-full/Toolchain.cmake index f30d258..43db33a 100644 --- a/linux-arm64-full/Toolchain.cmake +++ b/linux-arm64-full/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-arm64-lts/Toolchain.cmake b/linux-arm64-lts/Toolchain.cmake index bf3c1bf..f7f0616 100644 --- a/linux-arm64-lts/Toolchain.cmake +++ b/linux-arm64-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-arm64-musl/Toolchain.cmake b/linux-arm64-musl/Toolchain.cmake index 82ccf70..b4c07b8 100644 --- a/linux-arm64-musl/Toolchain.cmake +++ b/linux-arm64-musl/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-arm64/Toolchain.cmake b/linux-arm64/Toolchain.cmake index bf3c1bf..f7f0616 100644 --- a/linux-arm64/Toolchain.cmake +++ b/linux-arm64/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv5-musl/Toolchain.cmake b/linux-armv5-musl/Toolchain.cmake index 83b08bb..40ee4c7 100755 --- a/linux-armv5-musl/Toolchain.cmake +++ b/linux-armv5-musl/Toolchain.cmake @@ -10,7 +10,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv5-uclibc/Toolchain.cmake b/linux-armv5-uclibc/Toolchain.cmake index e4a744e..53d9140 100644 --- a/linux-armv5-uclibc/Toolchain.cmake +++ b/linux-armv5-uclibc/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv5/Toolchain.cmake b/linux-armv5/Toolchain.cmake index e4a744e..53d9140 100644 --- a/linux-armv5/Toolchain.cmake +++ b/linux-armv5/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv6-lts/Toolchain.cmake b/linux-armv6-lts/Toolchain.cmake index 78e8b5e..28b0f67 100644 --- a/linux-armv6-lts/Toolchain.cmake +++ b/linux-armv6-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv6-musl/Toolchain.cmake b/linux-armv6-musl/Toolchain.cmake index 471a9d8..bb60923 100644 --- a/linux-armv6-musl/Toolchain.cmake +++ b/linux-armv6-musl/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv6/Toolchain.cmake b/linux-armv6/Toolchain.cmake index 653fec0..ff3cb2c 100644 --- a/linux-armv6/Toolchain.cmake +++ b/linux-armv6/Toolchain.cmake @@ -10,7 +10,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv7-lts/Toolchain.cmake b/linux-armv7-lts/Toolchain.cmake index 78e8b5e..28b0f67 100644 --- a/linux-armv7-lts/Toolchain.cmake +++ b/linux-armv7-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv7/Toolchain.cmake b/linux-armv7/Toolchain.cmake index e4a744e..53d9140 100644 --- a/linux-armv7/Toolchain.cmake +++ b/linux-armv7/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv7a-lts/Toolchain.cmake b/linux-armv7a-lts/Toolchain.cmake index e4a744e..53d9140 100644 --- a/linux-armv7a-lts/Toolchain.cmake +++ b/linux-armv7a-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv7a/Toolchain.cmake b/linux-armv7a/Toolchain.cmake index e4a744e..53d9140 100644 --- a/linux-armv7a/Toolchain.cmake +++ b/linux-armv7a/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-armv7l-musl/Toolchain.cmake b/linux-armv7l-musl/Toolchain.cmake index 471a9d8..bb60923 100644 --- a/linux-armv7l-musl/Toolchain.cmake +++ b/linux-armv7l-musl/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-i686/Toolchain.cmake b/linux-i686/Toolchain.cmake index df7b879..74c9b3c 100644 --- a/linux-i686/Toolchain.cmake +++ b/linux-i686/Toolchain.cmake @@ -9,7 +9,7 @@ set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) set(CMAKE_Fortran_COMPILER $ENV{FC}) -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-m68k-uclibc/Toolchain.cmake b/linux-m68k-uclibc/Toolchain.cmake index 724123c..2d36338 100644 --- a/linux-m68k-uclibc/Toolchain.cmake +++ b/linux-m68k-uclibc/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-mips-lts/Toolchain.cmake b/linux-mips-lts/Toolchain.cmake index 3c81c93..3cc6b7c 100644 --- a/linux-mips-lts/Toolchain.cmake +++ b/linux-mips-lts/Toolchain.cmake @@ -9,7 +9,7 @@ set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) set(CMAKE_Fortran_COMPILER $ENV{FC}) -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-mips-uclibc/Toolchain.cmake b/linux-mips-uclibc/Toolchain.cmake index 0162bb4..37b591d 100644 --- a/linux-mips-uclibc/Toolchain.cmake +++ b/linux-mips-uclibc/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-mips/Toolchain.cmake b/linux-mips/Toolchain.cmake index 3c81c93..3cc6b7c 100644 --- a/linux-mips/Toolchain.cmake +++ b/linux-mips/Toolchain.cmake @@ -9,7 +9,7 @@ set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) set(CMAKE_Fortran_COMPILER $ENV{FC}) -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-mipsel-lts/Toolchain.cmake b/linux-mipsel-lts/Toolchain.cmake index 1d499a1..8fdabcd 100644 --- a/linux-mipsel-lts/Toolchain.cmake +++ b/linux-mipsel-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-ppc/Toolchain.cmake b/linux-ppc/Toolchain.cmake index c6fee29..00414bd 100644 --- a/linux-ppc/Toolchain.cmake +++ b/linux-ppc/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-ppc64le-lts/Toolchain.cmake b/linux-ppc64le-lts/Toolchain.cmake index 0eaefb7..ca15bc5 100644 --- a/linux-ppc64le-lts/Toolchain.cmake +++ b/linux-ppc64le-lts/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-ppc64le/Toolchain.cmake b/linux-ppc64le/Toolchain.cmake index 0eaefb7..ca15bc5 100644 --- a/linux-ppc64le/Toolchain.cmake +++ b/linux-ppc64le/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-riscv32/Toolchain.cmake b/linux-riscv32/Toolchain.cmake index af4e27d..8eea865 100644 --- a/linux-riscv32/Toolchain.cmake +++ b/linux-riscv32/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-riscv64/Toolchain.cmake b/linux-riscv64/Toolchain.cmake index c63bc24..40d0672 100644 --- a/linux-riscv64/Toolchain.cmake +++ b/linux-riscv64/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-s390x/Toolchain.cmake b/linux-s390x/Toolchain.cmake index e50ea9a..b31a96c 100644 --- a/linux-s390x/Toolchain.cmake +++ b/linux-s390x/Toolchain.cmake @@ -9,7 +9,7 @@ set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) set(CMAKE_Fortran_COMPILER $ENV{FC}) -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-x86_64-full/Toolchain.cmake b/linux-x86_64-full/Toolchain.cmake index 53ddf73..837fb6c 100644 --- a/linux-x86_64-full/Toolchain.cmake +++ b/linux-x86_64-full/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/linux-xtensa-uclibc/Toolchain.cmake b/linux-xtensa-uclibc/Toolchain.cmake index e727b21..1bb3c7d 100644 --- a/linux-xtensa-uclibc/Toolchain.cmake +++ b/linux-xtensa-uclibc/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/manylinux2014-aarch64/Toolchain.cmake b/manylinux2014-aarch64/Toolchain.cmake index 8991083..2c27246 100644 --- a/manylinux2014-aarch64/Toolchain.cmake +++ b/manylinux2014-aarch64/Toolchain.cmake @@ -12,7 +12,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/web-wasi-emulated-threads/Toolchain.cmake b/web-wasi-emulated-threads/Toolchain.cmake index 23b245e..a7113f4 100644 --- a/web-wasi-emulated-threads/Toolchain.cmake +++ b/web-wasi-emulated-threads/Toolchain.cmake @@ -5,7 +5,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WASI_EMULATED_PTHREAD") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WASI_EMULATED_PTHREAD") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lwasi-emulated-pthread") -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT}) set(CMAKE_SYSROOT $ENV{WASI_SYSROOT}) set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh) diff --git a/web-wasi-threads/Toolchain.cmake b/web-wasi-threads/Toolchain.cmake index 326702c..df10134 100644 --- a/web-wasi-threads/Toolchain.cmake +++ b/web-wasi-threads/Toolchain.cmake @@ -1,7 +1,7 @@ set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH}) include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk-pthread.cmake) -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT}) set(CMAKE_SYSROOT $ENV{WASI_SYSROOT}) set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-threads-sysroot.sh) diff --git a/web-wasi/Toolchain.cmake b/web-wasi/Toolchain.cmake index 25480cf..79d6cbc 100644 --- a/web-wasi/Toolchain.cmake +++ b/web-wasi/Toolchain.cmake @@ -1,7 +1,7 @@ set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH}) include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake) -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT}) set(CMAKE_SYSROOT $ENV{WASI_SYSROOT}) set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh) diff --git a/windows-arm64/Toolchain.cmake b/windows-arm64/Toolchain.cmake index 0c739fd..51b803a 100644 --- a/windows-arm64/Toolchain.cmake +++ b/windows-arm64/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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) diff --git a/windows-armv7/Toolchain.cmake b/windows-armv7/Toolchain.cmake index e817674..ec06044 100644 --- a/windows-armv7/Toolchain.cmake +++ b/windows-armv7/Toolchain.cmake @@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC}) set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/") -set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple}) +list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_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)