X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9d31297f8e24b1bf548c4b0f76719ce163fe5a0e;hb=006de682ca07c04ab62cb43e4e8d923425f7f294;hp=ae76530d1885cd80cf6b7fa7a9d188f2d1049310;hpb=4bdfc5a09cab89fbaa691d16f277294e3262ce15;p=samples%2Fhello.git diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index ae76530..9d31297 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2020 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -30,12 +30,12 @@ ENDIF(WIN32) # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) +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 # =================== @@ -107,12 +107,9 @@ ENDIF(EXISTS ${GUI_ROOT_DIR}) ## From GUI: ## FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) + # Qt -IF(NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) -ELSE() - FIND_PACKAGE(SalomeQt5 REQUIRED) -ENDIF() +FIND_PACKAGE(SalomeQt5 REQUIRED) # Detection summary: SALOME_PACKAGE_REPORT_AND_CHECK()