From d6a5182da8ac58392f7ce09689653752d6e76b0a Mon Sep 17 00:00:00 2001
From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Mon, 22 Mar 2021 19:55:01 +0100
Subject: [PATCH] Improvements of SALOME/ParaView5.9 build : remove glfw need
 and adapt qt flags

---
 applications/ParaView-5.9.0.pyconf    |  1 -
 applications/SALOME-master.pyconf     |  1 -
 products/compil_scripts/qt-5.12.10.sh |  4 ++--
 products/glfw.pyconf                  | 17 -----------------
 products/openVKL.pyconf               |  4 ++--
 5 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 products/glfw.pyconf

diff --git a/applications/ParaView-5.9.0.pyconf b/applications/ParaView-5.9.0.pyconf
index e07915f..50491f1 100644
--- a/applications/ParaView-5.9.0.pyconf
+++ b/applications/ParaView-5.9.0.pyconf
@@ -45,7 +45,6 @@ APPLICATION :
         embree : '3.12.2'
         freeimage : '3.16.0'
         freetype : '2.9.1'
-        glfw : 'native'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
         idna : '2.7'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index fddfd4a..6a56b52 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -46,7 +46,6 @@ APPLICATION :
         embree : '3.12.2'
         freeimage : '3.16.0'
         freetype : '2.9.1'
-        glfw : 'native'
         gmsh : '4.1.4'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
diff --git a/products/compil_scripts/qt-5.12.10.sh b/products/compil_scripts/qt-5.12.10.sh
index e83d672..8f5773b 100755
--- a/products/compil_scripts/qt-5.12.10.sh
+++ b/products/compil_scripts/qt-5.12.10.sh
@@ -22,12 +22,12 @@ rm -rf $BUILD_DIR && mkdir -p $BUILD_DIR && cd $BUILD_DIR
 
 # For -qt-harfbuzz option, see spns #9694
 echo
-echo "*** $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib"
+echo "*** $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper"
 
 $SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \
     -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine \
     -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz \
-    -no-openssl -no-glib
+    -no-openssl -no-glib -no-jasper
 
 if [ $? -ne 0 ]
 then
diff --git a/products/glfw.pyconf b/products/glfw.pyconf
deleted file mode 100644
index 39411dc..0000000
--- a/products/glfw.pyconf
+++ /dev/null
@@ -1,17 +0,0 @@
-default :
-{
-    name : "glfw"
-    get_source : "native"
-    system_info : 
-    {
-        rpm : []
-        rpm_dev : ["glfw-devel"]
-        apt : []
-        apt_dev : ["libglfw3-dev"]
-    }
-    depend : []
-    properties :
-    {
-      incremental : "yes"
-    }
-}
diff --git a/products/openVKL.pyconf b/products/openVKL.pyconf
index 1dc31ca..c797092 100644
--- a/products/openVKL.pyconf
+++ b/products/openVKL.pyconf
@@ -2,13 +2,13 @@ default :
 {
     name : "openVKL"
     build_source : "cmake"
-    cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib"
+    cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF"
     get_source : "archive"
     environ :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'tbb','glfw', 'ispc', 'rkCommon', 'embree']
+    depend : ['Python', 'tbb', 'ispc', 'rkCommon', 'embree']
     build_depend : ['cmake']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-- 
2.39.2