From: michael <michael@localhost.localdomain>
Date: Thu, 15 Apr 2021 18:48:41 +0000 (+0200)
Subject: Kernel version is not 7.8.0
X-Git-Tag: V9_7_0~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e44eb4ff4fe89937717981fa48f687c2272a98c8;p=tools%2Fsolverlab.git

Kernel version is not 7.8.0
---

diff --git a/CoreFlows/gui/salome/CMakeLists.txt b/CoreFlows/gui/salome/CMakeLists.txt
index c1f4b95..743cffc 100755
--- a/CoreFlows/gui/salome/CMakeLists.txt
+++ b/CoreFlows/gui/salome/CMakeLists.txt
@@ -16,27 +16,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-cmake_minimum_required (VERSION 3.1)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-INCLUDE(CMakeDependentOption)
-
-# Versioning
-# ===========
-# Project name, upper case
-STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
-
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 8)
-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 1)
-
-# User options
-# ============
-OPTION(SALOME_BUILD_DOC "Generate SALOME CoreFlows documentation" ON)
-OPTION(SALOME_BUILD_TESTS "Generate SALOME CoreFlows tests" ON)
 
 # Common CMake macros
 # ===================
@@ -74,12 +53,9 @@ INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # =============
 
 # Mandatory products
-IF(  ${SalomeKERNEL_VERSION} STRLESS "7.8.0")
-         FIND_PACKAGE(SalomePython REQUIRED)
-ELSE()
-         FIND_PACKAGE(SalomePythonInterp REQUIRED)
-         FIND_PACKAGE(SalomePythonLibs REQUIRED)
-ENDIF()
+ FIND_PACKAGE(SalomePythonInterp REQUIRED)
+ FIND_PACKAGE(SalomePythonLibs REQUIRED)
+
 MESSAGE(STATUS "SalomeKERNEL_VERSION is ${SalomeKERNEL_VERSION}")
 
 # Qt5