X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=10fb7d49246b561a49dcd6102a20d607b4a51fca;hb=0ed56e5073cbee776a668e76822f46a5fab1b8cd;hp=37fa5d94d0e5d668111108b86d8037c71626f093;hpb=4e9fa6a7f415f8dfa6f72a4b638faf91c3770d01;p=modules%2Fsmesh.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 37fa5d94d..10fb7d492 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ ENDIF(WIN32) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) 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})