From: bruneton <bruneton>
Date: Tue, 27 Aug 2013 08:59:14 +0000 (+0000)
Subject: CMake: using new macros SALOME_UPDATE_FLAG_AND_LOG_PACKAGE() and SALOME_PACKAGE_REPORT().
X-Git-Tag: BR_hydro_v_0_3_1~76
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cc50eaa7c0639d2cf9b80ef08f368a700a62cc1c;p=modules%2Fgui.git

CMake: using new macros SALOME_UPDATE_FLAG_AND_LOG_PACKAGE() and SALOME_PACKAGE_REPORT().
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00bd3df4b..f3401aada 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,12 +106,16 @@ IF(NOT SALOME_LIGHT_ONLY)
 ENDIF() 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
-  FIND_PACKAGE(SalomeCppUnit REQUIRED)  
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_UPDATE_FLAG_AND_LOG_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_UPDATE_FLAG_AND_LOG_PACKAGE(Doxygen SALOME_BUILD_DOC)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Graphviz SALOME_BUILD_DOC)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF()
 
 ##
@@ -131,19 +135,26 @@ FIND_PACKAGE(SalomePyQt4 REQUIRED)
 
 # Optional prerequisites for GUI
 IF(SALOME_USE_OCCVIEWER)
-  FIND_PACKAGE(SalomeCAS REQUIRED)
+  FIND_PACKAGE(SalomeCAS)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(CAS SALOME_USE_OCCVIEWER)
 ENDIF()
 IF(SALOME_USE_GLVIEWER)
-  FIND_PACKAGE(SalomeOpenGL REQUIRED) 
+  FIND_PACKAGE(SalomeOpenGL)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenGL SALOME_USE_GLVIEWER) 
 ENDIF()
 IF(SALOME_USE_VTKVIEWER)
   # Required components are listed in the FindSalomeVTK.cmake file: 
-  FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) 
+  FIND_PACKAGE(SalomeVTK 6.0) 
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(VTK SALOME_USE_VTKVIEWER)
 ENDIF()
 IF(SALOME_USE_PLOT2DVIEWER)
-  FIND_PACKAGE(SalomeQwt REQUIRED)  
+  FIND_PACKAGE(SalomeQwt)  
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Qwt SALOME_USE_PLOT2DVIEWER)
 ENDIF()
 
+# Detection summary:
+SALOME_PACKAGE_REPORT()
+
 # Directories
 # (default values taken from KERNEL)
 # ===========