Merge pull request #608 from manongjohn/fix_macos_actions_build
Fix macOS actions build
This commit is contained in:
commit
85e1d0d61f
3 changed files with 17 additions and 4 deletions
|
@ -11,7 +11,15 @@ then
|
|||
fi
|
||||
cd build
|
||||
|
||||
if [ -d /usr/local/Cellar/qt@5 ]
|
||||
then
|
||||
QTVERSION=`ls /usr/local/Cellar/qt@5`
|
||||
USEQTLIB="/usr/local/opt/qt@5/lib/"
|
||||
else
|
||||
QTVERSION=`ls /usr/local/Cellar/qt`
|
||||
USEQTLIB="/usr/local/opt/qt/lib/"
|
||||
fi
|
||||
|
||||
echo "QT Version detected: $QTVERSION"
|
||||
|
||||
if [ -d ../../thirdparty/canon/Header ]
|
||||
|
@ -22,7 +30,7 @@ fi
|
|||
export MACOSX_DEPLOYMENT_TARGET=10.13
|
||||
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig"
|
||||
cmake ../sources $CANON_FLAG \
|
||||
-DQT_PATH=/usr/local/opt/qt/lib/ \
|
||||
-DQT_PATH=$USEQTLIB \
|
||||
-DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
|
||||
-DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
|
||||
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
#!/bin/bash
|
||||
if [ -d /usr/local/Cellar/qt@5 ]
|
||||
then
|
||||
export QTDIR=/usr/local/opt/qt@5
|
||||
else
|
||||
export QTDIR=/usr/local/opt/qt
|
||||
fi
|
||||
export TOONZDIR=toonz/build/toonz
|
||||
|
||||
# If found, use Xcode Release build
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
brew update
|
||||
# Remove symlink to bin/2to3 in order for latest python to install
|
||||
rm -f '/usr/local/bin/2to3'
|
||||
brew install boost qt clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm aom dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
|
||||
brew install boost qt@5 clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm aom dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
|
||||
|
|
Loading…
Reference in a new issue