Reapply commit b31c8411.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58d0acdd76f7f3021a72df7bd5c745a7dcc5effe..ef1cdb922f39eaeeca85bc27d4d0c395c2afce00 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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,6 +38,7 @@ SET(SUBDIR_CORBA
   Notification
   NOTIFICATION_SWIG
   Container
+  SALOMESDS
   TestContainer
   Launcher
   LifeCycleCORBA
@@ -73,28 +75,24 @@ SET(SUBDIR_CPPUNIT_CORBA
 )
 SET(SUBDIR_CPPUNIT_GENERAL UnitTests)
 
-IF(SALOME_LAUNCHER_ONLY)
-  SET(SUBDIRS Basics ResourcesManager Launcher)
-ELSE()
-  SET(SUBDIRS ${SUBDIR_BASE})
-  IF(NOT SALOME_LIGHT_ONLY)
-    LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
-  ENDIF()
+SET(SUBDIRS ${SUBDIR_BASE})
+IF(NOT SALOME_LIGHT_ONLY)
+  LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
+ENDIF()
 
-  IF(SALOME_USE_MPI)
-    LIST(APPEND SUBDIRS ${SUBDIR_MPI})
+IF(SALOME_USE_MPI)
+  LIST(APPEND SUBDIRS ${SUBDIR_MPI})
 ENDIF(SALOME_USE_MPI)
 
 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()
+ENDIF()
 
-  IF(SALOME_PACO_PARALLEL)
-    LIST(APPEND SUBDIRS  ${SUBDIR_PARALLEL})
-  ENDIF()
+IF(SALOME_PACO_PARALLEL)
+  LIST(APPEND SUBDIRS  ${SUBDIR_PARALLEL})
 ENDIF()
 
 FOREACH(_dir ${SUBDIRS})