X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9a8696b4ee7f67877e6c2c8bda2450cec794aece;hb=52e19ac3f0b8977eacd755183ba75559ada0d5f6;hp=8796330c7bc83a437cb3b7ffb7e7ddd4c13e5a5d;hpb=07c0897d109f195fb52301a591e59dad594bc93c;p=samples%2Fpyhello.git diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index 8796330..9a8696b --- 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 @@ -19,16 +19,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) PROJECT(SalomePYHELLO C CXX) -# Ensure a proper linker behavior: -CMAKE_POLICY(SET CMP0003 NEW) - # Versioning # =========== # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) +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}) @@ -101,11 +98,7 @@ ENDIF(EXISTS ${GUI_ROOT_DIR}) ## From GUI: ## # 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()