CMake: reverting to the previous behaviour for optional prerequisites.

[modules/kernel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cd3236d6afd3df2ee5178ecbaebba84f9162bb2..db000aea71611b7cbfec40a91111899a83f0f34e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,8 @@ MARK_AS_ADVANCED(SALOME_LIGHT_ONLY SALOME_USE_LIBBATCH SALOME_PACO_PARALLEL SALO
 # Exception: LibBatch is optional but is loaded first, as it can
 # give Python, Pthread and SWIG:
 IF(SALOME_USE_LIBBATCH)
-  FIND_PACKAGE(SalomeLibBatch REQUIRED)
+  FIND_PACKAGE(SalomeLibBatch)
+  SALOME_LOG_OPTIONAL_PACKAGE(LibBatch SALOME_USE_LIBBATCH)
 ENDIF()
 
 FIND_PACKAGE(SalomePython REQUIRED)
@@ -104,14 +105,21 @@ IF(SALOME_PACO_PARALLEL)
 ENDIF()
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
-  FIND_PACKAGE(SalomeCppUnit REQUIRED)  
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)  
 ENDIF()
 IF(SALOME_BUILD_DOC)
-  FIND_PACKAGE(SalomeDoxygen REQUIRED)
-  FIND_PACKAGE(SalomeGraphviz)          # Remains optional even here.
-  FIND_PACKAGE(SalomeSphinx REQUIRED)
+  FIND_PACKAGE(SalomeDoxygen)
+  FIND_PACKAGE(SalomeGraphviz)
+  FIND_PACKAGE(SalomeSphinx)
+  SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
+  SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC)
+  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()
 
+# Detection summary:
+SALOME_PACKAGE_REPORT_AND_CHECK()
+
 # Directories
 #
 # Directories have to be given after prerequisites (to be able to use
@@ -182,16 +190,22 @@ 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 pakage src\DSC on windows
+IF(NOT WINDOWS)
+  SET(DSC_TGS CalciumC SalomeCalcium SalomeDatastream 
+  SalomePalm SalomeDSCSupervBasic SalomeDSCSuperv)
+ENDIF(NOT WINDOWS)
+
 SET(_${PROJECT_NAME}_exposed_targets
-  CalciumC SalomeCalcium DF Launcher  
-  OpUtil Registry ResourcesManager SALOMEBasics SalomeCatalog SalomeCommunication
-  SalomeContainer SalomeDatastream SalomePalm SalomeDSCContainer SalomeDSClient
-  SalomeDSCSupervBasic SalomeDSCSuperv SalomeDSImpl 
-  SalomeDS  SalomeGenericObj SalomeHDFPersist SalomeIDLKernel
-  SalomeLauncher  SalomeLifeCycleCORBA  SALOMELocalTrace 
+  ${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)
+  SalomeResourcesManager TOOLSDS with_loggerTraceCollector 
+  SalomeKernelHelpers)
   
 # MPI specific targets:
 IF(SALOME_USE_MPI)