]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
remove Qt4 option
authorPaul RASCLE <paul.rascle@openfields.fr>
Sun, 28 Jun 2020 21:10:02 +0000 (23:10 +0200)
committerYOANN AUDOUIN <B61570@dsp0851742.postes.calibre.edf.fr>
Fri, 30 Oct 2020 16:08:09 +0000 (17:08 +0100)
CMakeLists.txt

index b7bfb7448a6e56ae1f45407b05a19b1ad18bf897..d366cbfa3e9fa893b7366d7f693d59108af48c51 100644 (file)
@@ -136,24 +136,24 @@ ENDIF()
 FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 
 # Qt
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork QtTest)
-  SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
-  SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt4 PyQt4)
-ELSE()
+#IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+#  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml QtWebKit QtOpenGL QtNetwork QtTest)
+#  SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
+#  SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt4 PyQt4)
+#ELSE()
   FIND_PACKAGE(SalomeQt5 REQUIRED)
   SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
   SALOME_CONFIGURE_PREPARE(HYDROData HYDROGUI HYDROPy Qt5 PyQt5)
-ENDIF()
+#ENDIF()
 
 # PyQt
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
-  FIND_PACKAGE(SalomePyQt4 REQUIRED)
-  SET(PYQT_ROOT_DIR "${PYQT4_ROOT_DIR}")
-ELSE()
+#IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+#  FIND_PACKAGE(SalomePyQt4 REQUIRED)
+#  SET(PYQT_ROOT_DIR "${PYQT4_ROOT_DIR}")
+#ELSE()
   FIND_PACKAGE(SalomePyQt5 REQUIRED)
   SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
-ENDIF()
+#ENDIF()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()