X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=26de8514e12eee1d9dca2ed4693617f02fff94c6;hb=32cb9f7cf3440f3c495de75632b4cefbd23298a2;hp=f4cfd56b9901f2f1c89c85fc3c59040d02e6fdb1;hpb=76696150988f7ec8125bc44a53e32e0981ced631;p=modules%2Fkernel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f4cfd56b9..26de8514e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,8 +30,8 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) 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) @@ -49,24 +49,25 @@ SET(BUILD_SHARED_LIBS TRUE) SET(CALCIUM_IDL_INT_F77 long) SET(CALCIUM_CORBA_INT_F77 CORBA::Long) SET(LONG_OR_INT int) -# Global definitions -ADD_DEFINITIONS(-DSIZEOF_FORTRAN_INTEGER=4 -DSIZEOF_INT=4) -## OmniORB already defines SIZEOF_LONG -# ADD_DEFINITIONS(-DSIZEOF_LONG=${SIZE_OF_LONG}) # User options # ============ -CMAKE_DEPENDENT_OPTION(SALOME_USE_MPI "Use MPI containers" OFF - "NOT SALOME_PACO_PARALLEL" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME KERNEL documentation" ON) OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) # Advanced: OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF) -OPTION(SALOME_USE_LIBBATCH "Use LibBatch in KERNEL" ON) -OPTION(SALOME_PACO_PARALLEL "Build with PACO (implies SALOME_USE_MPI)" OFF) -OPTION(SALOME_LAUNCHER_ONLY "Build only the Launcher part" OFF) -MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_PACO_PARALLEL SALOME_LAUNCHER_ONLY) +OPTION(SALOME_USE_LIBBATCH "Use LibBatch in KERNEL" OFF) +OPTION(SALOME_USE_SIMAN "Add SIMAN support" OFF) +CMAKE_DEPENDENT_OPTION(SALOME_PACO_PARALLEL "Build with PACO (implies SALOME_USE_MPI)" OFF + "NOT SALOME_LIGHT_ONLY" OFF) +OPTION(SALOME_USE_PORTMANAGER "Add PortManager support" OFF) +CMAKE_DEPENDENT_OPTION(SALOME_USE_MPI "Use MPI containers" OFF + "NOT SALOME_PACO_PARALLEL" ON) +CMAKE_DEPENDENT_OPTION(SALOME_USE_MPI "Use MPI containers" ${SALOME_USE_MPI} + "NOT SALOME_LIGHT_ONLY" OFF) +MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_USE_SIMAN SALOME_PACO_PARALLEL SALOME_USE_PORTMANAGER) +SET(SALOME_LAUNCHER_ONLY OFF) # deprecated option: Build only the Launcher part # Required prerequisites # Find "big" prerequisites first - they reference themselves many others @@ -76,7 +77,8 @@ MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_PACO_PARALLEL SALO # Exception: LibBatch is optional but is loaded first, as it can # give Python, Pthread and SWIG: IF(SALOME_USE_LIBBATCH) - FIND_PACKAGE(SalomeLibBatch REQUIRED) + FIND_PACKAGE(SalomeLibBatch) + SALOME_LOG_OPTIONAL_PACKAGE(LibBatch SALOME_USE_LIBBATCH) ENDIF() FIND_PACKAGE(SalomePython REQUIRED) @@ -89,6 +91,11 @@ FIND_PACKAGE(SalomeBoost REQUIRED) # Optional prerequisites # ====================== +IF(SALOME_USE_SIMAN) + FIND_PACKAGE(SalomeSimanIO) + SALOME_LOG_OPTIONAL_PACKAGE(SimanIO SALOME_USE_SIMAN) + ADD_DEFINITIONS(-DWITH_SIMANIO) +ENDIF() IF(NOT SALOME_LIGHT_ONLY) FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) @@ -102,16 +109,26 @@ ENDIF() IF(SALOME_PACO_PARALLEL) FIND_PACKAGE(SalomePaco REQUIRED) ENDIF() +IF(SALOME_USE_PORTMANAGER) + ADD_DEFINITIONS(-DWITH_PORTMANAGER) +ENDIF() IF(SALOME_BUILD_TESTS) ENABLE_TESTING() - FIND_PACKAGE(SalomeCppUnit REQUIRED) + FIND_PACKAGE(SalomeCppUnit) + SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS) ENDIF() IF(SALOME_BUILD_DOC) - FIND_PACKAGE(SalomeDoxygen REQUIRED) - FIND_PACKAGE(SalomeGraphviz) # Remains optional even here. - FIND_PACKAGE(SalomeSphinx REQUIRED) + FIND_PACKAGE(SalomeDoxygen) + FIND_PACKAGE(SalomeGraphviz) + FIND_PACKAGE(SalomeSphinx) + SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) ENDIF() +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + # Directories # # Directories have to be given after prerequisites (to be able to use @@ -132,6 +149,12 @@ SET(SALOME_INSTALL_APPLISKEL_SCRIPTS ${SALOME_INSTALL_BINS}/appliskel CACHE PATH SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH "Install path: SALOME application skeleton - Python") SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files") +SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG salome_adm/unix CACHE PATH + "Install path: SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_AMCONFIG_LOCAL adm_local/unix CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff") @@ -140,14 +163,23 @@ SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE P SET(SALOME_INSTALL_RES share/salome/resources CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC share/doc/salome CACHE PATH "Install path: SALOME documentation") + # Kernel specific: SET(SALOME_KERNEL_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/kernel" CACHE PATH "Install path: SALOME KERNEL specific data") SET(SALOME_KERNEL_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/kernel" CACHE PATH "Install path: SALOME KERNEL specific scripts") 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_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_RES) -MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_KERNEL_INSTALL_RES_DATA SALOME_KERNEL_INSTALL_RES_SCRIPTS) +MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_KERNEL_INSTALL_RES_DATA SALOME_KERNEL_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG SALOME_INSTALL_AMCONFIG_LOCAL) + +# Accumulate environment variables for KERNEL module +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} + ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON} + ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}) +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) # Sources # ======== @@ -165,7 +197,7 @@ ENDIF() # Header configuration # ==================== SALOME_XVERSION(${PROJECT_NAME}) -SALOME_CONFIGURE_FILE(KERNEL_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/KERNEL_version.h INSTALL ${SALOME_INSTALL_HEADERS}) +SALOME_CONFIGURE_FILE(KERNEL_version.h.in KERNEL_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export # ==================== @@ -173,30 +205,62 @@ INCLUDE(CMakePackageConfigHelpers) # List of targets in this project we want to make visible to the rest of the world. # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" -SET(_${PROJECT_NAME}_exposed_targets - CalciumC SalomeCalcium DF Launcher - OpUtil Registry ResourcesManager SALOMEBasics SalomeCatalog SalomeCommunication - SalomeContainer SalomeDatastream SalomePalm SalomeDSCContainer SalomeDSClient - SalomeDSCSupervBasic SalomeDSCSuperv SalomeDSImpl - SalomeDS SalomeGenericObj SalomeHDFPersist SalomeIDLKernel - SalomeLauncher SalomeLifeCycleCORBA SALOMELocalTrace - SalomeLoggerServer SalomeNotification SalomeNS - SalomeResourcesManager - TOOLSDS with_loggerTraceCollector SalomeKernelHelpers) + +IF(SALOME_LAUNCHER_ONLY) + SET(_${PROJECT_NAME}_exposed_targets + SALOMEBasics ResourcesManager Launcher) +ELSE() + SET(_${PROJECT_NAME}_exposed_targets + SALOMEBasics SALOMELocalTrace SalomeHDFPersist OpUtil) + + # CORBA specific targets: + IF(NOT SALOME_LIGHT_ONLY) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + DF SalomeLoggerServer with_loggerTraceCollector SalomeNS SalomeGenericObj + Registry SalomeCatalog ResourcesManager SalomeResourcesManager + SalomeNotification SalomeContainer Launcher SalomeLauncher + SalomeLifeCycleCORBA SalomeDSClient TOOLSDS SalomeKernelHelpers + SalomeDSImpl SalomeDS SalomeCommunication SalomeDSCContainer) + # Temporary solution for package src\DSC on windows + IF(NOT WIN32) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + CalciumC SalomeCalcium SalomeDatastream SalomePalm SalomeDSCSupervBasic + SalomeDSCSuperv) + IF(SALOME_PACO_PARALLEL) + LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelDSCContainer) + ENDIF() + ENDIF() + ENDIF() -# MPI specific targets: -IF(SALOME_USE_MPI) - LIST(APPEND _${PROJECT_NAME}_exposed_targets - SalomeMPIContainer SalomeTestMPIComponentEngine) -ENDIF() + # MPI specific targets: + IF(SALOME_USE_MPI) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + SalomeMPIContainer SalomeTestMPIComponentEngine) + ENDIF() + + # Test targets: + IF(SALOME_BUILD_TESTS) + LIST(APPEND _${PROJECT_NAME}_exposed_targets SALOMELocalTraceTest UnitTests) + IF(NOT SALOME_LIGHT_ONLY) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + SALOMETraceCollectorTest UtilsTest NamingServiceTest SalomeTestComponentEngine + LifeCycleCORBATest SalomeKernelHelpersTest SALOMEDSImplTest SALOMEDSTest) + ENDIF() + ENDIF() -# Test targets: -IF(SALOME_BUILD_TESTS) - LIST(APPEND _${PROJECT_NAME}_exposed_targets - LifeCycleCORBATest NamingServiceTest SALOMEDSImplTest SALOMEDSTest SALOMELocalTraceTest - SalomeTestComponentEngine SALOMETraceCollectorTest UtilsTest ) + # PACO specific targets: + IF(SALOME_PACO_PARALLEL) + LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelContainer) + ENDIF() ENDIF() - + +IF(NOT SALOME_LIGHT_ONLY) + LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeIDLKernel) + IF(SALOME_PACO_PARALLEL) + LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelIDLKernel) + ENDIF() +ENDIF() + # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake) @@ -213,15 +277,21 @@ SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}") SET(OMNIORB_ROOT_DIR "${OMNIORB_ROOT_DIR}") SET(OMNIORBPY_ROOT_DIR "${OMNIORBPY_ROOT_DIR}") SET(LIBBATCH_ROOT_DIR "${LIBBATCH_ROOT_DIR}") - +SET(SIMANIO_ROOT_DIR "${SIMANIO_ROOT_DIR}") + SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") -CONFIGURE_PACKAGE_CONFIG_FILE(salome_adm/cmake_files/${PROJECT_NAME}Config.cmake.in + +# Build variables that will be expanded when configuring SalomeConfig.cmake: +SALOME_CONFIGURE_PREPARE(CppUnit Graphviz Doxygen Sphinx MPI omniORB LibBatch + PThread Boost HDF5 libXml2 Python SimanIO) + +CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR SPHINX_ROOT_DIR MPI_ROOT_DIR OMNIORB_ROOT_DIR OMNIORBPY_ROOT_DIR LIBBATCH_ROOT_DIR - PTHREAD_ROOT_DIR BOOST_ROOT_DIR HDF5_ROOT_DIR LIBXML2_ROOT_DIR + SIMANIO_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR HDF5_ROOT_DIR LIBXML2_ROOT_DIR PYTHON_ROOT_DIR SWIG_ROOT_DIR) # - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?): @@ -234,7 +304,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(salome_adm/cmake_files/${PROJECT_NAME}Config.cmake # PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX # CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR # SPHINX_ROOT_DIR MPI_ROOT_DIR OMNIORB_ROOT_DIR OMNIORBPY_ROOT_DIR LIBBATCH_ROOT_DIR -# PTHREAD_ROOT_DIR BOOST_ROOT_DIR HDF5_ROOT_DIR LIBXML2_ROOT_DIR +# SIMANIO_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR HDF5_ROOT_DIR LIBXML2_ROOT_DIR # PYTHON_ROOT_DIR SWIG_ROOT_DIR) WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake