premiere/premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

update travis OSX image to the latest version

Browse Source
This commit is contained in:
arvidn 2019-10-15 08:25:26 +02:00 committed by Arvid Norberg
parent 4b8f8d7e92
commit 9115c8c28d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -20,7 +20,7 @@ matrix:
- env: cmake=1 toolset=gcc - env: cmake=1 toolset=gcc
- env: variant=test_debug crypto=openssl docs=1 tests=1 examples=1 tools=1 python=1 toolset=darwin ios=1 - env: variant=test_debug crypto=openssl docs=1 tests=1 examples=1 tools=1 python=1 toolset=darwin ios=1
os: osx os: osx
osx_image: xcode9.2 osx_image: xcode11.2
- env: arch=arm toolset=gcc-arm - env: arch=arm toolset=gcc-arm
notifications: notifications:
@ -216,6 +216,10 @@ script:
# the same, in order for builds to be reused between invocations # the same, in order for builds to be reused between invocations
- export B2_ARGS="crypto=$crypto debug-iterators=on picker-debugging=on asserts=on invariant-checks=full $toolset variant=$variant" - export B2_ARGS="crypto=$crypto debug-iterators=on picker-debugging=on asserts=on invariant-checks=full $toolset variant=$variant"
- 'if [[ $TRAVIS_OS_NAME == "osx" && "$crypto" == "openssl" ]]; then
export B2_ARGS="${B2_ARGS} openssl-lib=/usr/local/opt/openssl@1.1/lib openssl-include=/usr/local/opt/openssl@1.1/include" ;
fi'
- 'if [ "$check_headers" == "1" ]; then - 'if [ "$check_headers" == "1" ]; then
${B2} -j3 check-headers ${B2_ARGS}; ${B2} -j3 check-headers ${B2_ARGS};
fi' fi'

16
Jamfile
View File

@ -28,20 +28,21 @@ if $(BOOST_ROOT)
else else
{ {
local boost-lib-search-path = local boost-lib-search-path =
<search>/usr/local/lib <search>/usr/local/opt/boost/lib
; ;
local boost-include-path = local boost-include-path =
<include>/usr/local/include <include>/usr/local/opt/boost/include
<include>/usr/sfw/include
; ;
# the names are decorated in MacPorts # the names are decorated in MacPorts.
lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-lib-search-path) lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-lib-search-path)
: : $(boost-include-path) ; : : $(boost-include-path) ;
lib boost_system : : <name>boost_system $(boost-lib-search-path) # we can't add /usr/local/lib to the search path on mac, as that will
: : $(boost-include-path) ; # interfere with system libraries (specifically libjpeg)
lib boost_system : : <name>boost_system $(boost-lib-search-path) <search>/usr/local/lib
: : $(boost-include-path) <include>/usr/local/include ;
} }
VERSION = 1.2.2 ; VERSION = 1.2.2 ;
@ -211,6 +212,9 @@ rule warnings ( properties * )
# enable these warnings again, once the other ones are dealt with # enable these warnings again, once the other ones are dealt with
result += <cflags>-Wno-weak-vtables ; result += <cflags>-Wno-weak-vtables ;
result += <cflags>-Wno-return-std-move-in-c++11 ;
result += <cflags>-Wno-unknown-warning-option ;
} }
if <toolset>gcc in $(properties) if <toolset>gcc in $(properties)