From: rnv Date: Fri, 31 May 2019 09:21:20 +0000 (+0300) Subject: Remove QT4 compatibility: additional changes. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df16dcf75e378e7e7a5460bfc47ba516a59dee25;p=modules%2Fsmesh.git Remove QT4 compatibility: additional changes. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 95d1ef7e2..147ce7f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,19 +151,11 @@ IF(SALOME_BUILD_GUI) ## Prerequisites From GUI: ## # Qt - IF(NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) - ELSE() - FIND_PACKAGE(SalomeQt5 REQUIRED) - ENDIF() + FIND_PACKAGE(SalomeQt5 REQUIRED) # SIP FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5 # PyQt - IF (NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(SalomePyQt4 REQUIRED) - ELSE() - FIND_PACKAGE(SalomePyQt5 REQUIRED) - ENDIF() + FIND_PACKAGE(SalomePyQt5 REQUIRED) # Qwt FIND_PACKAGE(SalomeQwt REQUIRED) ELSE(EXISTS ${GUI_ROOT_DIR})