diff --git a/.travis.yml b/.travis.yml index 6ebb46106..e38a39427 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,13 +65,13 @@ matrix: os: osx osx_image: xcode9.4 env: - - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/ios.toolchain.cmake -DIOS_PLATFORM=OS .. && make -j2" + - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/ios.toolchain.cmake -DIOS_PLATFORM=OS .. && make -j2" - name: "ios-iphonesimulator" os: osx osx_image: xcode9.4 env: - - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR .. && make -j2" + - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR .. && make -j2" before_install: - eval "${BEFORE_BUILD}" diff --git a/build.sh b/build.sh index 64c2249f1..5ec8edab1 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,7 @@ popd ##### linux of hisiv300 (forgot the chip name) toolchain with neon and openmp mkdir -p build-hisiv300-linux pushd build-hisiv300-linux -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/hisiv300.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/hisiv300.toolchain.cmake .. make make install popd @@ -35,7 +35,7 @@ popd ##### linux of hisiv500 (Hi3516CV200 and Hi3519V101) toolchain with neon and openmp mkdir -p build-hisiv500-linux pushd build-hisiv500-linux -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/hisiv500.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/hisiv500.toolchain.cmake .. make make install popd @@ -43,7 +43,7 @@ popd ##### linux of himix100 (Hi3559a) toolchain with neon and openmp mkdir -p build-himix100-linux pushd build-himix100-linux -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/himix100.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/himix100.toolchain.cmake .. make make install popd @@ -51,7 +51,7 @@ popd ##### linux of arm-linux-gnueabi toolchain mkdir -p build-arm-linux-gnueabi pushd build-arm-linux-gnueabi -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/arm-linux-gnueabi.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/arm-linux-gnueabi.toolchain.cmake .. make make install popd @@ -59,7 +59,7 @@ popd ##### linux of arm-linux-gnueabihf toolchain mkdir -p build-arm-linux-gnueabihf pushd build-arm-linux-gnueabihf -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/arm-linux-gnueabihf.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/arm-linux-gnueabihf.toolchain.cmake .. make make install popd @@ -67,7 +67,7 @@ popd ##### linux for aarch64-linux-gnu toolchain mkdir -p build-aarch64-linux-gnu pushd build-aarch64-linux-gnu -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/aarch64-linux-gnu.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/aarch64-linux-gnu.toolchain.cmake .. make make install popd @@ -75,7 +75,7 @@ popd ##### linux host system with gcc/g++ mkdir -p build-host-gcc-linux pushd build-host-gcc-linux -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/host.gcc.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/host.gcc.toolchain.cmake .. make make install popd @@ -83,7 +83,7 @@ popd ##### ios armv7 arm64 mkdir -p build-ios pushd build-ios -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/iosxc.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/iosxc.toolchain.cmake .. make make install popd @@ -91,7 +91,7 @@ popd ##### ios simulator i386 x86_64 mkdir -p build-ios-sim pushd build-ios-sim -cmake -DCMAKE_TOOLCHAIN_FILE=../toolchain/iossimxc.toolchain.cmake .. +cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/iossimxc.toolchain.cmake .. make make install popd diff --git a/toolchain/aarch64-linux-gnu.toolchain.cmake b/toolchains/aarch64-linux-gnu.toolchain.cmake similarity index 100% rename from toolchain/aarch64-linux-gnu.toolchain.cmake rename to toolchains/aarch64-linux-gnu.toolchain.cmake diff --git a/toolchain/arm-linux-gnueabi.toolchain.cmake b/toolchains/arm-linux-gnueabi.toolchain.cmake similarity index 100% rename from toolchain/arm-linux-gnueabi.toolchain.cmake rename to toolchains/arm-linux-gnueabi.toolchain.cmake diff --git a/toolchain/arm-linux-gnueabihf.toolchain.cmake b/toolchains/arm-linux-gnueabihf.toolchain.cmake similarity index 100% rename from toolchain/arm-linux-gnueabihf.toolchain.cmake rename to toolchains/arm-linux-gnueabihf.toolchain.cmake diff --git a/toolchain/himix100.toolchain.cmake b/toolchains/himix100.toolchain.cmake similarity index 100% rename from toolchain/himix100.toolchain.cmake rename to toolchains/himix100.toolchain.cmake diff --git a/toolchain/hisiv300.toolchain.cmake b/toolchains/hisiv300.toolchain.cmake similarity index 100% rename from toolchain/hisiv300.toolchain.cmake rename to toolchains/hisiv300.toolchain.cmake diff --git a/toolchain/hisiv500.toolchain.cmake b/toolchains/hisiv500.toolchain.cmake similarity index 100% rename from toolchain/hisiv500.toolchain.cmake rename to toolchains/hisiv500.toolchain.cmake diff --git a/toolchain/host.gcc.toolchain.cmake b/toolchains/host.gcc.toolchain.cmake similarity index 100% rename from toolchain/host.gcc.toolchain.cmake rename to toolchains/host.gcc.toolchain.cmake diff --git a/toolchain/ios.toolchain.cmake b/toolchains/ios.toolchain.cmake similarity index 100% rename from toolchain/ios.toolchain.cmake rename to toolchains/ios.toolchain.cmake diff --git a/toolchain/iossimxc.toolchain.cmake b/toolchains/iossimxc.toolchain.cmake similarity index 100% rename from toolchain/iossimxc.toolchain.cmake rename to toolchains/iossimxc.toolchain.cmake diff --git a/toolchain/iosxc.toolchain.cmake b/toolchains/iosxc.toolchain.cmake similarity index 100% rename from toolchain/iosxc.toolchain.cmake rename to toolchains/iosxc.toolchain.cmake diff --git a/toolchain/pi3.toolchain.cmake b/toolchains/pi3.toolchain.cmake similarity index 100% rename from toolchain/pi3.toolchain.cmake rename to toolchains/pi3.toolchain.cmake