Copyright update 2021

[modules/shaper_study.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf062dd4d5ec299de482c40ddff76fd66f5c4ee8..4550a1aaa3eec911775dd8cb4bb135d6a5264734 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2019-2021  CEA/DEN, EDF R&D
 #
 # 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(SalomeSHAPERSTUDY 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 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
 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})
@@ -39,7 +36,7 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
 IF(EXISTS ${CONFIGURATION_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
-  INCLUDE(SalomeMacros)
+  INCLUDE(SalomeMacros NO_POLICY_SCOPE)
 ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
 ENDIF()
@@ -54,8 +51,6 @@ SET(BUILD_SHARED_LIBS TRUE)
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
   ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
@@ -96,7 +91,6 @@ FIND_PACKAGE(SalomeSWIG REQUIRED)
 # ===========
 SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
 IF(EXISTS ${GEOM_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeGEOM REQUIRED)
   ADD_DEFINITIONS(${GEOM_DEFINITIONS})
   INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS})
@@ -117,6 +111,8 @@ IF(EXISTS ${SHAPER_ROOT_DIR})
   SET_AND_CHECK(SHAPER_INCLUDE_DIRS "${SHAPER_ROOT_DIR}/include/salome")
   INCLUDE_DIRECTORIES(${SHAPER_INCLUDE_DIRS})
   find_library(LIB_XAOShaper NAMES XAOShaper PATHS ${SHAPER_ROOT_DIR}/lib/salome)
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${SHAPER_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/salome)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${SHAPER_ROOT_DIR}/lib/salome) 
 ELSE(EXISTS ${SHAPER_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome SHAPER, please define SHAPER_ROOT_DIR")
 ENDIF(EXISTS ${SHAPER_ROOT_DIR})
@@ -134,7 +130,8 @@ SET(SALOME_INSTALL_IDLS           "${SALOME_INSTALL_IDLS}"           CACHE PATH
 SET(SALOME_INSTALL_HEADERS        "${SALOME_INSTALL_HEADERS}"        CACHE PATH "Install path: SALOME headers")
 SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH "Install path: SALOME scripts")
 SET(SALOME_INSTALL_SCRIPT_DATA    "${SALOME_INSTALL_SCRIPT_DATA}"    CACHE PATH "Install path: SALOME script data")
-SET(SALOME_INSTALL_SCRIPT_PYTHON  "${SALOME_INSTALL_SCRIPT_PYTHON}"  CACHE PATH "Install path: SALOME Python scripts")
+SET(SALOME_INSTALL_SCRIPT_PYTHON  "${SALOME_INSTALL_SCRIPT_PYTHON}"  CACHE PATH "Install path: SALOME Python executable scripts")
+SET(SALOME_INSTALL_PYTHON         "${SALOME_INSTALL_PYTHON}"         CACHE PATH "Install path: SALOME Python import modules")
 SET(SALOME_INSTALL_CMAKE_LOCAL    "${SALOME_INSTALL_CMAKE_LOCAL}"    CACHE PATH "Install path: SALOME CMake files")
 SET(SALOME_INSTALL_RES            "${SALOME_INSTALL_RES}"            CACHE PATH "Install path: SALOME resources")
 SET(SALOME_INSTALL_DOC            "${SALOME_INSTALL_DOC}"            CACHE PATH "Install path: SALOME documentation")
@@ -144,12 +141,12 @@ SET(SALOME_SHAPERSTUDY_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/shaperstudy" CACH
    
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
-MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC)
+MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_SHAPERSTUDY_INSTALL_RES_DATA)
 
 # Accumulate environment variables for SHAPERSTUDY module
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
-                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_PYTHON})
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
 SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
 
 # Sources