razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

try using the latest qt in travis-osx (#1910)

Browse source
This commit is contained in:
shun-iwasawa 2018-04-12 14:13:53 +09:00 committed by GitHub
parent 29ce0b3da6
commit 068277dbc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci-scripts/osx/travis-build.sh
View file

@ -4,7 +4,7 @@ pushd thirdparty/tiff-4.0.3
popd popd
cd toonz && mkdir build && cd build cd toonz && mkdir build && cd build
cmake ../sources \ cmake ../sources \
-DQT_PATH=/usr/local/Cellar/qt/5.9.2/lib/ \ -DQT_PATH=/usr/local/Cellar/qt/5.10.1/lib/ \
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \ -DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/ -DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
make -j 2 make -j 2

6
ci-scripts/osx/travis-install.sh
View file

@ -3,6 +3,6 @@ brew update
brew install glew lz4 lzo libusb libmypaint brew install glew lz4 lzo libusb libmypaint
brew tap tcr/tcr brew tap tcr/tcr
brew install clang-format brew install clang-format
# obtain qt5.9.2 from the previous version of the formula # from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/9bc1bdd8d26747cffd7a18c31975f86cd0a97bc3/Formula/qt.rb # so we start to use the latest version of Qt. (#1910)
brew install ./qt.rb brew install qt