From a44bb66bc6daa62b2e1a8b605b839e192248c3b8 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 10 Oct 2020 22:25:34 +0200 Subject: [PATCH] Fix vcpkg variable --- travis/build.sh | 0 travis/build_success.sh | 0 travis/deploy.sh | 0 travis/install_dependencies.sh | 0 travis/setup_variables.sh | 7 ++++++- 5 files changed, 6 insertions(+), 1 deletion(-) mode change 100644 => 100755 travis/build.sh mode change 100644 => 100755 travis/build_success.sh mode change 100644 => 100755 travis/deploy.sh mode change 100644 => 100755 travis/install_dependencies.sh mode change 100644 => 100755 travis/setup_variables.sh diff --git a/travis/build.sh b/travis/build.sh old mode 100644 new mode 100755 diff --git a/travis/build_success.sh b/travis/build_success.sh old mode 100644 new mode 100755 diff --git a/travis/deploy.sh b/travis/deploy.sh old mode 100644 new mode 100755 diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh old mode 100644 new mode 100755 diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh old mode 100644 new mode 100755 index f8dcc8c..be7461d --- a/travis/setup_variables.sh +++ b/travis/setup_variables.sh @@ -19,9 +19,14 @@ else export OPERATING_SYSTEM_NAME_SHORT=$OPERATING_SYSTEM_NAME fi +echo "====== Setup variables ======" +echo "Current root directory:" +echo "$(realpath .)" +echo "=============================" + # ====== OS Variables if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - export VCPKG_DIR=$TRAVIS_BUILD_DIR/vcpkg + export VCPKG_DIR="$(realpath .)/generate/vcpkg" export CMAKE_EXTRA_ARGUMENTS="-A x64 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake" 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"