Do not over write CatalogResources for a job on localhost with SalomeLauncher.

[modules/kernel.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 7ad8522..ad55a41
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2019  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
@@ -18,17 +18,18 @@
 #
 
 SET(SUBDIR_BASE
+  AppQuickStart
   Basics
   SALOMELocalTrace
   HDFPersist
   KERNEL_PY
+  Utils
 )
 
 SET(SUBDIR_CORBA
   DF
   Logger
   SALOMETraceCollector
-  Utils
   NamingService
   GenericObj
   Registry
@@ -37,26 +38,31 @@ SET(SUBDIR_CORBA
   Notification
   NOTIFICATION_SWIG
   Container
+  SALOMESDS
   TestContainer
   Launcher
+  Launcher_SWIG
   LifeCycleCORBA
   LifeCycleCORBA_SWIG
   SALOMEDSClient
   TOOLSDS
+  KernelHelpers
   SALOMEDSImpl
   SALOMEDS
-  KernelHelpers
   ModuleGenerator
   Communication
   Communication_SWIG
   DSC
 )
 
+SET(SUBDIR_MPI MPIContainer TestMPIContainer)
+SET(SUBDIR_PARALLEL ParallelContainer)
+
+# CppUnit directories:
 SET(SUBDIR_CPPUNIT_BASE
   Basics/Test
   SALOMELocalTrace/Test
 )
-
 SET(SUBDIR_CPPUNIT_CORBA
   Logger/Test
   SALOMETraceCollector/Test
@@ -68,52 +74,28 @@ SET(SUBDIR_CPPUNIT_CORBA
   SALOMEDS/Test
   KernelHelpers/Test
 )
-
 SET(SUBDIR_CPPUNIT_GENERAL UnitTests)
-SET(SUBDIR_MPI MPIContainer TestMPIContainer)
-SET(SUBDIR_PARALLEL ParallelContainer)
-
-IF(WITHONLYLAUNCHER)
-  SET(SUBDIRS Basics ResourcesManager Launcher)
-ELSE(WITHONLYLAUNCHER)
-  SET(SUBDIRS ${SUBDIR_BASE})
-ENDIF(WITHONLYLAUNCHER)
 
-IF(SALOME_USE_CORBA)
-  SET(SUBDIRS ${SUBDIRS} ${SUBDIR_CORBA})
-ENDIF(SALOME_USE_CORBA)
+SET(SUBDIRS ${SUBDIR_BASE})
+IF(NOT SALOME_LIGHT_ONLY)
+  LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
+ENDIF()
 
 IF(SALOME_USE_MPI)
-  SET(SUBDIRS
-    ${SUBDIRS}
-    ${SUBDIR_MPI}
-  )
+  LIST(APPEND SUBDIRS ${SUBDIR_MPI})
 ENDIF(SALOME_USE_MPI)
 
-IF(CPPUNIT_IS_OK)
-  IF(SALOME_USE_CORBA)
-    SET(SUBDIRS
-      ${SUBDIRS}
-      ${SUBDIR_CPPUNIT_BASE}
-      ${SUBDIR_CPPUNIT_CORBA}
-      ${SUBDIR_CPPUNIT_GENERAL}
-    )
-  ELSE(SALOME_USE_CORBA)
-    SET(SUBDIRS
-      ${SUBDIRS}
-      ${SUBDIR_CPPUNIT_BASE}
-      ${SUBDIR_CPPUNIT_GENERAL}
-    )
-  ENDIF(SALOME_USE_CORBA)
-ENDIF(CPPUNIT_IS_OK)
+IF(SALOME_BUILD_TESTS)
+  LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_BASE} ${SUBDIR_CPPUNIT_GENERAL})
+  IF(NOT SALOME_LIGHT_ONLY)
+    LIST(APPEND SUBDIRS ${SUBDIR_CPPUNIT_CORBA})
+  ENDIF()
+ENDIF()
 
-IF(WITH_PACO_PARALLEL)
-  SET(SUBDIRS
-    ${SUBDIRS}
-    ${SUBDIR_PARALLEL}
-  )
-ENDIF(WITH_PACO_PARALLEL)
+IF(SALOME_PACO_PARALLEL)
+  LIST(APPEND SUBDIRS  ${SUBDIR_PARALLEL})
+ENDIF()
 
-FOREACH(DIR ${SUBDIRS})
-  ADD_SUBDIRECTORY(${DIR})
-ENDFOREACH(DIR ${SUBDIRS})
+FOREACH(_dir ${SUBDIRS})
+  ADD_SUBDIRECTORY(${_dir})
+ENDFOREACH()