salome info & salome connect

[modules/yacs.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c7aaefda62e83456624747ffd4bb927c2ac9e2..ab2e7838ee240c55416d685ccfcda8613c5436d4 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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
@@ -30,7 +30,7 @@ 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 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})
@@ -61,13 +61,12 @@ 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)
+OPTION(SALOME_USE_PORTMANAGER "Add PortManager support" ON)
 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
@@ -206,52 +205,47 @@ 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"
 
-IF(SALOME_LAUNCHER_ONLY)
-  SET(_${PROJECT_NAME}_exposed_targets 
-    SALOMEBasics ResourcesManager Launcher)
-ELSE()
-  SET(_${PROJECT_NAME}_exposed_targets 
-    SALOMEBasics SALOMELocalTrace SalomeHDFPersist OpUtil)
+SET(_${PROJECT_NAME}_exposed_targets 
+  SALOMEBasics SALOMELocalTrace SalomeHDFPersist OpUtil)
     
-  # CORBA specific targets:
-  IF(NOT SALOME_LIGHT_ONLY)
+# 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 SalomeSDS 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 
-      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()
+      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()
+# 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()
 
-  # PACO specific targets:
-  IF(SALOME_PACO_PARALLEL)
-    LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelContainer)
-  ENDIF()
+# PACO specific targets:
+IF(SALOME_PACO_PARALLEL)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeParallelContainer)
 ENDIF()
              
 IF(NOT SALOME_LIGHT_ONLY)