Minor documentation and code review corrections (39)

[modules/adao.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a791c1214a90a8a401bb6c63149c9945a8a21d15..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)
@@ -40,42 +37,56 @@ endif(NOT PYTHONINTERP_FOUND)
 set(ADAO_SCRIPT_PYTHON "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
 set(ADAO_SCRIPT_PYTHON_SALOME "${ADAO_SCRIPT_PYTHON}/salome")
 set(ADAO_LIB "lib/salome")
-set(ADAO_RES "share/salome/resources/adao")
-set(ADAO_BIN "bin/salome")
+set(ADAO_RES "share/resources/adao")
+set(ADAO_RES_SALOME "share/salome/resources/adao")
+set(ADAO_BIN "bin")
 set(ADAO_BIN_TEST "bin/salome/test")
+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 NO_POLICY_SCOPE)
+else()
+  message(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+endif()
 
 if(ADAO_PYTHON_MODULE)
-  
+
+  install(FILES COPYING.txt README.txt DESTINATION $ENV{CURRENT_SOFTWARE_INSTALL_DIR})
+
+  if(ADAO_BUILD_DOC)
+    find_package(SalomeSphinx)
+    if(NOT SPHINX_FOUND)
+      message(FATAL_ERROR "Sphinx has not been found !")
+    endif(NOT SPHINX_FOUND)
+    add_subdirectory(doc)
+  endif(ADAO_BUILD_DOC)
+
   add_subdirectory(src)
-  
+  add_subdirectory(resources)
+  add_subdirectory(bin)
+  add_subdirectory(i18n)
+  add_subdirectory(test)
+
 else(ADAO_PYTHON_MODULE)
 
+  include(SalomeSetupPlatform)
+
   # ADAO_SALOME_MODULE
-  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)
-
-    if(ADAO_BUILD_DOC)
-      find_package(SalomeSphinx)
-      if(NOT SPHINX_FOUND)
-       message(FATAL_ERROR "Sphinx has not been found !")
-      endif(NOT SPHINX_FOUND)
-    endif(ADAO_BUILD_DOC)
-    
-  else()
-    message(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
-  endif()
+  install(FILES COPYING.txt README.txt DESTINATION $ENV{CURRENT_SOFTWARE_INSTALL_DIR})
 
   find_package(SalomeOmniORB REQUIRED)
   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.")
   endif(NOT ADAO_PYTHON_ROOT_DIR)
-  find_file(FILE_OF_ADAO_PYTHON_MODULE "daCore/__init__.py" PATHS "${ADAO_PYTHON_ROOT_DIR}/${ADAO_SCRIPT_PYTHON_SALOME}/adao")
+
+  find_file(FILE_OF_ADAO_PYTHON_MODULE "daCore/__init__.py" PATHS "${ADAO_PYTHON_ROOT_DIR}/${ADAO_SCRIPT_PYTHON}/adao")
   if(NOT FILE_OF_ADAO_PYTHON_MODULE)
     message(FATAL_ERROR "Could not locate daCore/__init__.py into specified ADAO_PYTHON_ROOT_DIR directory ! Sounds bad !")
   endif(NOT FILE_OF_ADAO_PYTHON_MODULE)
@@ -83,20 +94,15 @@ else(ADAO_PYTHON_MODULE)
   if(NOT EFICAS_ROOT_DIR)
     message(FATAL_ERROR "EFICAS_ROOT_DIR is absolutely needed !")
   endif(NOT EFICAS_ROOT_DIR)
-  
-  find_file(FILE_OF_EFICAS "generator/__init__.py" PATHS ${EFICAS_ROOT_DIR})
 
+  find_file(FILE_OF_EFICAS "generator/__init__.py" PATHS ${EFICAS_ROOT_DIR})
   if(NOT FILE_OF_EFICAS)
     message(FATAL_ERROR "Could not locate generator/__init__.py into EFICAS_ROOT_DIR")
   endif(NOT FILE_OF_EFICAS)
-  
+
   add_subdirectory(src)
   add_subdirectory(idl)
   add_subdirectory(resources)
-  add_subdirectory(bin)
-  add_subdirectory(examples)
   add_subdirectory(test)
-  add_subdirectory(i18n)
-  add_subdirectory(doc)
-  
+
 endif(ADAO_PYTHON_MODULE)