From 954475c1f121ad01b1073b77b52c9f095c0963c6 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 10 Oct 2020 23:14:17 +0200 Subject: [PATCH] Update install_dependencies.sh and setup_variables.sh --- travis/install_dependencies.sh | 2 +- travis/setup_variables.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index 232e775..d95a63a 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -34,7 +34,7 @@ elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then [ -d ./windowsenv/ ] && $(yes | rm -rf ./windowsenv/) [ -d $VCPKG_DIR ] && $(yes | rm -rf $VCPKG_DIR) git clone --depth=1 https://github.com/tdlight-team/windows-amd64-prebuilt-libraries.git windowsenv - mv windowsenv/vcpkg/. $VCPKG_DIR + mv windowsenv/vcpkg $VCPKG_DIR else echo "Unrecognized os: $TRAVIS_OS_NAME" exit 1 diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh index cf1c15d..5de77db 100755 --- a/travis/setup_variables.sh +++ b/travis/setup_variables.sh @@ -27,7 +27,7 @@ echo "=============================" # ====== OS Variables if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export VCPKG_DIR="$(realpath .)/vcpkg" - export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DCMAKE_CL_64=1 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_PREFIX_PATH=$VCPKG_DIR/installed/x64-windows" + export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows" export PATH="$PATH:/c/tools/php74:/c/PHP:/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/Program Files/CMake/bin:/c/ProgramData/chocolatey/bin:/c/Program Files/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools:/c/Program Files/NASM" export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10" export CPU_CORES=" -- -m"