Merge pull request #1011 from DDRBoxman/cef

Build with CEF 3112 on OSX
master
Jim 2017-08-18 20:02:43 -07:00 committed by GitHub
commit 684db36996
3 changed files with 4 additions and 2 deletions

View File

@ -22,7 +22,7 @@ matrix:
- os: osx
env:
- CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
- CEF_BUILD_VERSION=3.2987.1588.g1952835
- CEF_BUILD_VERSION=3.3112.1656.g9ec3e42
before_install: "./CI/install-dependencies-osx.sh"
before_script: "./CI/before-script-osx.sh"
before_deploy: "./CI/before-deploy-osx.sh"

View File

@ -40,6 +40,8 @@ sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
wget --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
# remove a broken test
sed -i '.orig' '/add_subdirectory(tests\/ceftests)/d' ./CMakeLists.txt
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 ..

@ -1 +1 @@
Subproject commit 0e4c9e824bdbe4c5f9b684968eb85963e19a52a3
Subproject commit 04bcdfeb400a789dca59863f009e68a6375ab3b0