X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=26de8514e12eee1d9dca2ed4693617f02fff94c6;hb=32cb9f7cf3440f3c495de75632b4cefbd23298a2;hp=e86e5c210b82e53aeedd08a264c56308abd2b3ce;hpb=32c8695f9e409767c7d885bc869963d51b8fb7dc;p=modules%2Fkernel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e86e5c210..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) @@ -52,8 +52,6 @@ SET(LONG_OR_INT int) # 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) @@ -61,9 +59,15 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OFF) OPTION(SALOME_USE_LIBBATCH "Use LibBatch in KERNEL" OFF) OPTION(SALOME_USE_SIMAN "Add SIMAN support" OFF) -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_USE_SIMAN SALOME_PACO_PARALLEL SALOME_LAUNCHER_ONLY) +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 @@ -88,8 +92,8 @@ FIND_PACKAGE(SalomeBoost REQUIRED) # ====================== IF(SALOME_USE_SIMAN) - FIND_PACKAGE(SalomeSIMANIO) - SALOME_LOG_OPTIONAL_PACKAGE(SIMANIO SALOME_USE_SIMAN) + FIND_PACKAGE(SalomeSimanIO) + SALOME_LOG_OPTIONAL_PACKAGE(SimanIO SALOME_USE_SIMAN) ADD_DEFINITIONS(-DWITH_SIMANIO) ENDIF() IF(NOT SALOME_LIGHT_ONLY) @@ -105,6 +109,9 @@ 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) @@ -199,35 +206,61 @@ 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" -# Temporary solution for package src\DSC on windows -IF(NOT WIN32) - SET(DSC_TGS CalciumC SalomeCalcium SalomeDatastream - SalomePalm SalomeDSCSupervBasic SalomeDSCSuperv) -ENDIF() - -SET(_${PROJECT_NAME}_exposed_targets - ${DSC_TGS} DF Launcher OpUtil Registry ResourcesManager - SALOMEBasics SalomeCatalog SalomeCommunication SalomeContainer - SalomeDSCContainer SalomeDSClient 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) @@ -250,7 +283,7 @@ SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/inc # 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) + PThread Boost HDF5 libXml2 Python SimanIO) CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake