New CMake procedure.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b355f8186be12810a68f4d55aa7e5ef3b14b939..15d7bcadd8b30559478974d4b1ec9d092349406f 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,11 +52,14 @@ SET(SUBDIR_CORBA
   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 +71,32 @@ SET(SUBDIR_CPPUNIT_CORBA
   SALOMEDS/Test
   KernelHelpers/Test
 )
-
 SET(SUBDIR_CPPUNIT_GENERAL UnitTests)
-SET(SUBDIR_MPI MPIContainer TestMPIContainer)
-SET(SUBDIR_PARALLEL ParallelContainer)
 
-IF(WITHONLYLAUNCHER)
+IF(SALOME_LAUNCHER_ONLY)
   SET(SUBDIRS Basics ResourcesManager Launcher)
-ELSE(WITHONLYLAUNCHER)
+ELSE()
   SET(SUBDIRS ${SUBDIR_BASE})
-ENDIF(WITHONLYLAUNCHER)
-
-IF(SALOME_USE_CORBA)
-  SET(SUBDIRS ${SUBDIRS} ${SUBDIR_CORBA})
-ENDIF(SALOME_USE_CORBA)
+  IF(NOT SALOME_LIGHT_ONLY)
+    LIST(APPEND SUBDIRS ${SUBDIR_CORBA})
+  ENDIF()
 
-IF(SALOME_USE_MPI)
-  SET(SUBDIRS
-    ${SUBDIRS}
-    ${SUBDIR_MPI}
-  )
+  IF(SALOME_USE_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()
+ENDIF()
 
-FOREACH(DIR ${SUBDIRS})
-  ADD_SUBDIRECTORY(${DIR})
-ENDFOREACH(DIR ${SUBDIRS})
+FOREACH(_dir ${SUBDIRS})
+  ADD_SUBDIRECTORY(${_dir})
+ENDFOREACH()