From d8fb555a6a219d33ff6949b05798930a4f55e14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jun 2016 23:03:23 +0200 Subject: [PATCH] package/ci: consistent build directory naming. --- package/ci/travis-ios-simulator.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh index 2ca875087..0f70a8623 100755 --- a/package/ci/travis-ios-simulator.sh +++ b/package/ci/travis-ios-simulator.sh @@ -10,8 +10,8 @@ cd corrade # Build native corrade-rc mkdir build && cd build cmake .. \ - -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ + -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \ + -DCMAKE_INSTALL_RPATH=$HOME/deps-native/lib \ -DWITH_INTERCONNECT=OFF \ -DWITH_PLUGINMANAGER=OFF \ -DWITH_TESTSUITE=OFF \ @@ -25,8 +25,8 @@ cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps/bin/corrade-rc \ - -DCMAKE_INSTALL_PREFIX=$HOME/deps-ios \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DTESTSUITE_TARGET_XCTEST=ON \ @@ -43,8 +43,8 @@ cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps/bin/corrade-rc \ - -DCMAKE_PREFIX_PATH="$HOME/deps-ios;$TRAVIS_BUILD_DIR/sdl2" \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCMAKE_PREFIX_PATH="$HOME/deps;$TRAVIS_BUILD_DIR/sdl2" \ -DCMAKE_BUILD_TYPE=Release \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=ON \