Corrected compilation errors

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 076e609d4356b136bc9cd529f5ddef725f038e52..d203f18faa6c0465bada75d4300d0cd27b6434a6 100644 (file)
--- 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