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

Fix workaround for GLEW

Browse source 
Co-authored-by: manongjohn <19245851+manongjohn@users.noreply.github.com>
This commit is contained in:
Tact Yoshida 2020-02-04 03:19:37 +09:00 committed by manongjohn
parent ddf3a8b5a5
commit 9fcfa63453
3 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ci-scripts/osx/tahoma-install.sh
View file

@ -3,13 +3,3 @@ brew update
# from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
# so we start to use the latest version of Qt. (#1910)
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
# delete older qt versions and make sure to have only the latest
brew cleanup qt
# temp workaround to brew installed glew cmake info overriding glew lib detection
# which causes compiling issues later
if [ -L /usr/local/lib/cmake/glew ]
then
echo "Symbolic link '/usr/local/lib/cmake/glew' detected. Removing to avoid glew lib detection issue!"
ls -l /usr/local/lib/cmake/glew
rm /usr/local/lib/cmake/glew
fi

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

@ -6,13 +6,3 @@ brew install clang-format
# from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
# so we start to use the latest version of Qt. (#1910)
brew install qt
# delete older qt versions and make sure to have only the latest
brew cleanup qt
# temp workaround to brew installed glew cmake info overriding glew lib detection
# which causes compiling issues later
if [ -L /usr/local/lib/cmake/glew ]
then
echo "Symbolic link '/usr/local/lib/cmake/glew' detected. Removing to avoid glew lib detection issue!"
ls -l /usr/local/lib/cmake/glew
rm /usr/local/lib/cmake/glew
fi

6
toonz/sources/CMakeLists.txt
View file

@ -395,7 +395,11 @@ elseif(BUILD_ENV_APPLE)
if(GLEW-NOTFOUND)
pkg_check_modules(GLEW REQUIRED glew)
endif()
set(GLEW_LIB ${GLEW_LIBRARIES})
if (TARGET GLEW::GLEW)
set(GLEW_LIB GLEW::GLEW)
else()
set(GLEW_LIB ${GLEW_LIBRARIES})
endif()
pkg_check_modules(LZ4_LIB REQUIRED liblz4)