X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=98aabaa48082f6cdd8e2e63217054a89c998ba1c;hb=fb8796ae39f96cebaa64b0c3e4a4543554ef7abb;hp=5473e437ac7ab000f4be2ae6c95f0e8d41b71c4c;hpb=abb6a2d62f613e8b74f02c3147b780451fff0858;p=samples%2Fpyhello.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5473e43..98aabaa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 6) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 7) 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}) @@ -89,9 +89,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR}) ## ## From GUI: ## -# Qt4 -FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) -INCLUDE(${QT_USE_FILE}) +# Qt +IF(NOT SALOME_GUI_BUILD_WITH_QT5) + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) +ELSE() + FIND_PACKAGE(SalomeQt5 REQUIRED) +ENDIF() # Detection summary: SALOME_PACKAGE_REPORT_AND_CHECK()