Documentation, style and code performance update

[modules/adao.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83d5b176de09308ed3a0b9ec9785de47e10eb1df..d8956b49c0128f4fc0b431a123e5eefb470cab8a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2019 EDF R&D
+# Copyright (C) 2008-2023 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
@@ -20,9 +20,6 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-# Ensure a proper linker behavior:
-CMAKE_POLICY(SET CMP0003 NEW)
-
 project(ADAO)
 
 include(CMakeDependentOption)
@@ -49,7 +46,7 @@ set(ADAO_TEST "share/test/adao")
 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()
@@ -74,6 +71,8 @@ if(ADAO_PYTHON_MODULE)
 
 else(ADAO_PYTHON_MODULE)
 
+  include(SalomeSetupPlatform)
+
   # ADAO_SALOME_MODULE
   install(FILES COPYING.txt README.txt DESTINATION $ENV{CURRENT_SOFTWARE_INSTALL_DIR})
 
@@ -81,6 +80,7 @@ else(ADAO_PYTHON_MODULE)
   find_package(SalomeOmniORBPy REQUIRED)
   find_package(SalomeKERNEL REQUIRED)
   KERNEL_WITH_CORBA()
+  add_definitions(${OMNIORB_DEFINITIONS})
 
   if(NOT ADAO_PYTHON_ROOT_DIR)
     message(FATAL_ERROR "ADAO_PYTHON_ROOT_DIR cmake variable has to be set if ADAO_SALOME_MODULE option is ON.")