From: Quentin COZETTE (qc784398) <quentin.cozette@cea.fr>
Date: Fri, 13 Nov 2020 15:58:11 +0000 (+0100)
Subject: Adapt Paraview and qt build type depending on SAT_DEBUG value (backwards compatibilit... 
X-Git-Tag: V9_6_0^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=177f716c877eaf82838a77fb89230bf037049834;p=tools%2Fsat_salome.git

Adapt Paraview and qt build type depending on SAT_DEBUG value (backwards compatibility with 8.5.0+)
---

diff --git a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
index 1bcde0d..ba93e77 100755
--- a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
+++ b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
@@ -16,7 +16,12 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
 
 ### common settings
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+if [ -n "$SAT_DEBUG" ]
+then
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+else
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
 
diff --git a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
index c962bd4..f88ce12 100755
--- a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
+++ b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
@@ -16,7 +16,12 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
 
 ### common settings
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+if [ -n "$SAT_DEBUG" ]
+then
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+else
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
 
diff --git a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
index b3c6dc8..a474f99 100755
--- a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
+++ b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
@@ -16,7 +16,12 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_VERBOSE_MAKEFILE=ON"
 
 ### common settings
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+if [ -n "$SAT_DEBUG" ]
+then
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Debug"
+else
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBUILD_TESTING:BOOL=OFF"
 
diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index 3ee02da..c37f2f3 100755
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -12,7 +12,12 @@ CMAKE_OPTIONS=""
 ### common compiler and install settings
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release"
+if [ -n "$SAT_DEBUG" ]
+then
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Debug"
+else
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE:STRING=Release"
+fi
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS:STRING=-m64"
 CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_FLAGS:STRING=-m64"
 
diff --git a/products/compil_scripts/qt.sh b/products/compil_scripts/qt.sh
index cc943e3..7071766 100755
--- a/products/compil_scripts/qt.sh
+++ b/products/compil_scripts/qt.sh
@@ -16,11 +16,18 @@ then
     export  QMAKE_CXXFLAGS="-std=c++11"
 fi
 
+if [ -n "$SAT_DEBUG" ]
+then
+    BUILD_TYPE="-debug"
+else
+    BUILD_TYPE="-release"
+fi
+
 # For -qt-harfbuzz option, see spns #9694
 echo
-echo "*** ./configure -prefix $PRODUCT_INSTALL -release -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 "*** ./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"
 
-./configure -prefix $PRODUCT_INSTALL -release -opensource -nomake tests -nomake examples -no-rpath \
+./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