X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=CMakeLists.txt;h=147ce7f9df493958d17b857fc9e74916c8b5a669;hp=37fa5d94d0e5d668111108b86d8037c71626f093;hb=3f36e2f8be3687a5c1b48595f878df46c4d81e74;hpb=474a24023d42179de2c114e5c3844f0b857ddca3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 37fa5d94d..147ce7f9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 0) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # Common CMake macros # =================== @@ -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})