diff --git a/android-arm/Toolchain.cmake b/android-arm/Toolchain.cmake index b9d6b60..58ef7ba 100644 --- a/android-arm/Toolchain.cmake +++ b/android-arm/Toolchain.cmake @@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR armv7-a) set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a) -set(cross_triple arm-linux-androideabi) +set(cross_triple $ENV{CROSS_TRIPLE}) set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT}) set(CMAKE_ANDROID_ARM_MODE ON) set(CMAKE_ANDROID_ARM_NEON ON) diff --git a/android-arm64/Toolchain.cmake b/android-arm64/Toolchain.cmake index d91805e..08b920d 100644 --- a/android-arm64/Toolchain.cmake +++ b/android-arm64/Toolchain.cmake @@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR aarch64) set(CMAKE_ANDROID_ARCH_ABI arm64-v8a) -set(cross_triple aarch64-linux-android) +set(cross_triple $ENV{CROSS_TRIPLE}) set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT}) set(CMAKE_ANDROID_ARM_MODE ON) set(CMAKE_ANDROID_ARM_NEON ON) diff --git a/android-x86/Toolchain.cmake b/android-x86/Toolchain.cmake index 625ca53..23d44fa 100644 --- a/android-x86/Toolchain.cmake +++ b/android-x86/Toolchain.cmake @@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR i686) set(CMAKE_ANDROID_ARCH_ABI x86) -set(cross_triple i686-linux-android) +set(cross_triple $ENV{CROSS_TRIPLE}) set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT}) set(CMAKE_ANDROID_ARM_MODE ON) set(CMAKE_ANDROID_ARM_NEON ON) diff --git a/android-x86_64/Toolchain.cmake b/android-x86_64/Toolchain.cmake index bcf384f..bdd1cd6 100644 --- a/android-x86_64/Toolchain.cmake +++ b/android-x86_64/Toolchain.cmake @@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR x86_64) set(CMAKE_ANDROID_ARCH_ABI x86_64) -set(cross_triple x86_64-linux-android) +set(cross_triple $ENV{CROSS_TRIPLE}) set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT}) set(CMAKE_ANDROID_ARM_MODE ON) set(CMAKE_ANDROID_ARM_NEON ON) diff --git a/linux-arm64-full/Toolchain.cmake b/linux-arm64-full/Toolchain.cmake index 071546c..c2fdfea 100644 --- a/linux-arm64-full/Toolchain.cmake +++ b/linux-arm64-full/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(cross_triple "aarch64-buildroot-linux-gnu") -set(cross_root /buildroot) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) @@ -13,9 +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_PACKAGE 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) diff --git a/linux-armv5/Toolchain.cmake b/linux-armv5/Toolchain.cmake index 8943221..6998d38 100644 --- a/linux-armv5/Toolchain.cmake +++ b/linux-armv5/Toolchain.cmake @@ -1,8 +1,9 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR arm) -set(cross_triple "armv5-unknown-linux-gnueabi") -set(cross_root /usr/xcc/${cross_triple}) + +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-armv6-lts/Toolchain.cmake b/linux-armv6-lts/Toolchain.cmake index f2965db..5102080 100644 --- a/linux-armv6-lts/Toolchain.cmake +++ b/linux-armv6-lts/Toolchain.cmake @@ -1,8 +1,9 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR arm) -set(cross_triple "armv6-unknown-linux-gnueabihf") -set(cross_root /usr/xcc/${cross_triple}) + +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-armv7/Toolchain.cmake b/linux-armv7/Toolchain.cmake index a2d16bd..6998d38 100644 --- a/linux-armv7/Toolchain.cmake +++ b/linux-armv7/Toolchain.cmake @@ -1,8 +1,9 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR arm) -set(cross_triple "armv7-unknown-linux-gnueabi") -set(cross_root /usr/xcc/${cross_triple}) + +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-armv7a/Toolchain.cmake b/linux-armv7a/Toolchain.cmake index ec26650..6998d38 100644 --- a/linux-armv7a/Toolchain.cmake +++ b/linux-armv7a/Toolchain.cmake @@ -1,8 +1,9 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR arm) -set(cross_triple "arm-cortexa8_neon-linux-gnueabihf") -set(cross_root /usr/xcc/${cross_triple}) + +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-m68k-uclibc/Toolchain.cmake b/linux-m68k-uclibc/Toolchain.cmake index 82fabdb..01246c4 100644 --- a/linux-m68k-uclibc/Toolchain.cmake +++ b/linux-m68k-uclibc/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR mk68) -set(cross_triple "m68k-unknown-uclinux-uclibc") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-mips/Toolchain.cmake b/linux-mips/Toolchain.cmake index 3f93f2f..bcacd04 100644 --- a/linux-mips/Toolchain.cmake +++ b/linux-mips/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR mips) -set(cross_triple "mips-unknown-linux-gnu") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-ppc64le/Toolchain.cmake b/linux-ppc64le/Toolchain.cmake index 6fcc5a6..43ccc8f 100644 --- a/linux-ppc64le/Toolchain.cmake +++ b/linux-ppc64le/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR ppc64le) -set(cross_triple "powerpc64le-unknown-linux-gnu") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-riscv32/Toolchain.cmake b/linux-riscv32/Toolchain.cmake index d014745..c4b8acf 100644 --- a/linux-riscv32/Toolchain.cmake +++ b/linux-riscv32/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR riscv32) -set(cross_triple "riscv32-unknown-linux-gnu") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-riscv64/Toolchain.cmake b/linux-riscv64/Toolchain.cmake index 0734da0..34f20a7 100644 --- a/linux-riscv64/Toolchain.cmake +++ b/linux-riscv64/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR riscv64) -set(cross_triple "riscv64-unknown-linux-gnu") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-s390x/Toolchain.cmake b/linux-s390x/Toolchain.cmake index 2fffdd9..aaa6e52 100644 --- a/linux-s390x/Toolchain.cmake +++ b/linux-s390x/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR s390x) -set(cross_triple "s390x-ibm-linux-gnu") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/linux-xtensa-uclibc/Toolchain.cmake b/linux-xtensa-uclibc/Toolchain.cmake index 207050b..d61500a 100644 --- a/linux-xtensa-uclibc/Toolchain.cmake +++ b/linux-xtensa-uclibc/Toolchain.cmake @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR xtensa) -set(cross_triple "xtensa-fsf-linux-uclibc") -set(cross_root /usr/xcc/${cross_triple}) +set(cross_triple $ENV{CROSS_TRIPLE}) +set(cross_root $ENV{CROSS_ROOT}) set(CMAKE_C_COMPILER $ENV{CC}) set(CMAKE_CXX_COMPILER $ENV{CXX}) diff --git a/windows-armv7/Toolchain.cmake b/windows-armv7/Toolchain.cmake index 2eea570..977627f 100644 --- a/windows-armv7/Toolchain.cmake +++ b/windows-armv7/Toolchain.cmake @@ -16,4 +16,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) -set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm) \ No newline at end of file +set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)