From: ndjinga <michael.ndjinga@cea.fr>
Date: Mon, 5 Oct 2020 12:20:39 +0000 (+0200)
Subject: Corrected compilation errors
X-Git-Tag: V9_6_0~25^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f1bc6db82b6a3b0b68f0686a97dfbd30285eac0a;p=tools%2Fsolverlab.git

Corrected compilation errors
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 076e609..d203f18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -431,24 +431,22 @@ ELSE (${CMAKE_VERSION} VERSION_GREATER "3.12.0")
   set(Python_VERSION_MINOR ${PYTHON_VERSION_MINOR})
 ENDIF(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
 
-IF  ( PYQT5_ROOT_DIR OR ENV{PYQT5_ROOT_DIR})
-  IF  ( PYQT5_ROOT_DIR )
-    set(PYQT5_ROOT_DIR ${PYQT5_ROOT_DIR} )
-  ELSE( PYQT5_ROOT_DIR })
+IF  ( NOT PYQT5_ROOT_DIR )
     set(PYQT5_ROOT_DIR $ENV{PYQT5_ROOT_DIR} )
-  ENDIF( PYQT5_ROOT_DIR })
-ENDIF(PYQT5_ROOT_DIR OR ENV{PYQT5_ROOT_DIR})
+ENDIF( NOT PYQT5_ROOT_DIR )
 
 #Matplotlib
-IF  ( MATPLOTLIB_ROOT_DIR OR ENV{MATPLOTLIB_ROOT_DIR})
-  IF  ( MATPLOTLIB_ROOT_DIR )
-    set(PYQT5_ROOT_DIR ${PYQT5_ROOT_DIR} )
-  ELSE( MATPLOTLIB_ROOT_DIR })
+IF  ( NOT MATPLOTLIB_ROOT_DIR )
     set(MATPLOTLIB_ROOT_DIR $ENV{MATPLOTLIB_ROOT_DIR} )
-  ENDIF( MATPLOTLIB_ROOT_DIR })
-ENDIF(MATPLOTLIB_ROOT_DIR OR ENV{MATPLOTLIB_ROOT_DIR})
-
-set(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR} )
+ENDIF(MATPLOTLIB_ROOT_DIR )
+
+IF  ( NOT HDF5_ROOT_DIR )
+  IF  ( ENV{HDF5_ROOT_DIR} )
+    set(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR} )
+  ELSE( ENV{HDF5_ROOT_DIR} )
+    set(HDF5_ROOT_DIR ${HDF5_ROOT} )
+  ENDIF( ENV{HDF5_ROOT_DIR} )
+ENDIF(NOT HDF5_ROOT_DIR )
 
 
 #Paraview library paths