From ca148615ecc1f6c84e7e3aa9910a3c3bb1474eb4 Mon Sep 17 00:00:00 2001 From: Korijn van Golen Date: Tue, 5 Jul 2016 15:39:44 +0200 Subject: [PATCH] Revert --- recipe/build.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 3b03ffac..7d3f7b61 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,9 +4,18 @@ # building against osmesa or not CONDA_LST=`conda list` if [ `uname` = "Darwin" ]; then - SCREEN_ARGS="-DVTK_USE_X:BOOL=OFF -DVTK_USE_COCOA:BOOL=ON -DVTK_USE_CARBON:BOOL=OFF" + # FIXME something makes this end up single quoted on darwin... not sure how to resolve + SCREEN_ARGS="-DVTK_USE_X:BOOL=OFF \ + -DVTK_USE_COCOA:BOOL=ON \ + -DVTK_USE_CARBON:BOOL=OFF" elif [[ ${CONDA_LST}'y' == *'osmesa'* ]]; then - SCREEN_ARGS="-DVTK_USE_X:BOOL=OFF -DVTK_OPENGL_HAS_OSMESA:BOOL=ON -DOPENGL_INCLUDE_DIR:PATH=${PREFIX}/include -DOPENGL_gl_LIBRARY:FILEPATH=${PREFIX}/lib/libOSMesa.so -DOPENGL_glu_LIBRARY:FILEPATH=${PREFIX}/lib/libGLU.so -DOSMESA_INCLUDE_DIR:PATH=${PREFIX}/include -DOSMESA_LIBRARY:FILEPATH=${PREFIX}/lib/libOSMesa.so" + SCREEN_ARGS="-DVTK_USE_X:BOOL=OFF \ + -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ + -DOPENGL_INCLUDE_DIR:PATH=${PREFIX}/include \ + -DOPENGL_gl_LIBRARY:FILEPATH=${PREFIX}/lib/libOSMesa.so \ + -DOPENGL_glu_LIBRARY:FILEPATH=${PREFIX}/lib/libGLU.so \ + -DOSMESA_INCLUDE_DIR:PATH=${PREFIX}/include \ + -DOSMESA_LIBRARY:FILEPATH=${PREFIX}/lib/libOSMesa.so" else SCREEN_ARGS="-DVTK_USE_X:BOOL=ON" fi