From eb4b9012f55eb48534ed81c946b176f543acfa8b Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sun, 28 Jun 2020 23:10:02 +0200 Subject: [PATCH] remove Qt4 option --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7bfb744..d366cbfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() -- 2.39.2