From 108b296855ff89b8ef65d772069bd98ffd8caa28 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 1 Mar 2017 15:27:33 -0600 Subject: [PATCH] CI: Fix cef version variable --- CI/before-script-osx.sh | 2 +- CI/install-dependencies-osx.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index a8c3e96c4..d963eb2e5 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -1,3 +1,3 @@ mkdir build cd build -cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_$CEF_BUILD_VERSION_macosx64 .. +cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 .. diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index e62fd3497..f3831e264 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -32,9 +32,9 @@ mkdir ./sparkle tar -xf ./sparkle.tar.bz2 -C ./sparkle # CEF Stuff -curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 -f --retry 5 -C - -tar -xf ./cef_binary_$CEF_BUILD_VERSION_macosx64.tar.bz2 -cd ./cef_binary_$CEF_BUILD_VERSION_macosx64 +curl -kLO https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2 -f --retry 5 -C - +tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2 +cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64 mkdir build cd ./build cmake -DCMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ..