linux sdk: fix openimageio

NatronGitHub · Jun 13, 2020 · 619ae38 · 619ae38
1 parent 8f2cf8f
commit 619ae38
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/tools/jenkins/include/scripts/pkg/openimageio.sh b/tools/jenkins/include/scripts/pkg/openimageio.sh
@@ -39,10 +39,16 @@ if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/libOpenImageIO.so" ];
     OIIO_CMAKE_FLAGS+=( "-DUSE_FREETYPE:BOOL=TRUE" "-DFREETYPE_INCLUDE_PATH=$SDK_HOME/include" )
     OIIO_CMAKE_FLAGS+=( "-DUSE_FFMPEG:BOOL=FALSE" )
     OIIO_CMAKE_FLAGS+=( "-DLINKSTATIC=0" "-DBUILDSTATIC=0" )
-    OIIO_CMAKE_FLAGS+=( "-DOPENJPEG_HOME=$SDK_HOME" "-DOPENJPEG_INCLUDE_DIR=$SDK_HOME/include/openjpeg-$OPENJPEG2_VERSION_SHORT" "-DUSE_OPENJPEG:BOOL=TRUE" )
+    OIIO_CMAKE_FLAGS+=( "-DOpenJpeg_ROOT=$SDK_HOME" "-DOPENJPEG_HOME=$SDK_HOME" "-DOPENJPEG_INCLUDE_DIR=$SDK_HOME/include/openjpeg-$OPENJPEG2_VERSION_SHORT" "-DUSE_OPENJPEG:BOOL=TRUE" )
     OIIO_CMAKE_FLAGS+=( "-DUSE_HEIF:BOOL=TRUE" )
-    if [[ ! "$GCC_VERSION" =~ ^4\. ]]; then
-        OIIO_CMAKE_FLAGS+=( "-DUSE_CPP11:BOOL=FALSE" "-DUSE_CPP14:BOOL=FALSE" "-DUSE_CPP17:BOOL=FALSE" )
+    if version_gt 4.8.1 "$GCC_VERSION"; then
+        OIIO_CMAKE_FLAGS+=( "-DUSE_CPP11:BOOL=FALSE" )
+    fi
+    if version_gt 6.1 "$GCC_VERSION"; then
+        OIIO_CMAKE_FLAGS+=( "-DUSE_CPP14:BOOL=FALSE" )
+    fi
+    if version_gt 7.1 "$GCC_VERSION"; then
+        OIIO_CMAKE_FLAGS+=( "-DUSE_CPP17:BOOL=FALSE" )
     fi
     OIIO_CMAKE_FLAGS+=( "-DUSE_LIBRAW:BOOL=TRUE" "-DCMAKE_INSTALL_PREFIX=$SDK_HOME" )