Enable Embree in Travis/macOS build

appleseedhq · May 20, 2019 · ef79edb · ef79edb
1 parent 7d99775
commit ef79edb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/scripts/travis/build-linux.sh b/scripts/travis/build-linux.sh
@@ -78,12 +78,14 @@ echo "Building appleseed..."
 mkdir build
 pushd build
 
+# Disney material support is not enabled because Travis/Linux (Xenial) has Qt 5.5.1
+# while libSeExprEditor.so from the linux-deps package was built against Qt 5.12.0.
 cmake \
     -Wno-dev \
-    -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" \
     -DCMAKE_BUILD_TYPE=Debug \
-    -DUSE_SSE42=ON \
+    -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" \
     -DWITH_EMBREE=ON \
+    -DUSE_SSE42=ON \
     -DUSE_STATIC_BOOST=OFF \
     -DBOOST_INCLUDEDIR=$APPLESEED_DEPENDENCIES/include/boost_1_61_0 \
     -DBOOST_LIBRARYDIR=$APPLESEED_DEPENDENCIES/lib/ \

diff --git a/scripts/travis/build-macos.sh b/scripts/travis/build-macos.sh
@@ -69,7 +69,7 @@ brew upgrade python@2
 brew link python@2
 brew info python@2
 
-brew install boost boost-python llvm@5 lz4 openimageio qt xerces-c zlib
+brew install boost boost-python embree llvm@5 lz4 openimageio qt xerces-c zlib
 
 mkdir -p $HOME/Library/Python/2.7/lib/python/site-packages
 echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' \
@@ -163,6 +163,7 @@ cmake \
     -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_PREFIX_PATH=/usr/local/opt/qt \
     -DWITH_DISNEY_MATERIAL=ON \
+    -DWITH_EMBREE=ON \
     -DUSE_STATIC_BOOST=OFF \
     -DBoost_PYTHON_LIBRARY=/usr/local/lib/libboost_python27.dylib \
     -DOSL_INCLUDE_DIR=$THISDIR/include \