1) Rename SALOME_GEOM_USE_GUI -> SALOME_BUILD_GUI

[modules/geom.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce07ae11320bb3b3704fd91bfbe647002a983e00..95f7c507eb73a484f3b97b63c2a5300099eef7da 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,10 +64,10 @@ OPTION(SALOME_BUILD_DOC   "Generate SALOME GEOM documentation" ${SALOME_BUILD_DO
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS})
 
 # Advanced options:
-OPTION(SALOME_GEOM_USE_GUI    "Enable GUI" ON)
+OPTION(SALOME_BUILD_GUI       "Enable GUI" ON)
 OPTION(SALOME_GEOM_USE_OPENCV "Enable shape recognition from picture" ON)
 
-MARK_AS_ADVANCED(SALOME_GEOM_USE_GUI SALOME_GEOM_USE_OPENCV)
+MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV)
 
 # Prerequisites
 # =============
@@ -87,15 +87,12 @@ FIND_PACKAGE(SalomeBoost REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 #FIND_PACKAGE(SalomeLibXml2 REQUIRED)
-#FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
+FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 
 # Other KERNEL optionals:
-# IF(SALOME_USE_MPI)
-#   FIND_PACKAGE(SalomeMPI REQUIRED)
-#   IF(HDF5_IS_PARALLEL)
-#     SALOME_ADD_MPI_TO_HDF5()
-#   ENDIF()  
-# ENDIF()
+IF(SALOME_USE_MPI)
+  FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
+ENDIF()  
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
@@ -111,7 +108,7 @@ IF(SALOME_BUILD_DOC)
 ENDIF()
 
 # Find GUI (optional)
-IF(SALOME_GEOM_USE_GUI)
+IF(SALOME_BUILD_GUI)
   SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
   IF(EXISTS ${GUI_ROOT_DIR})
     LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
@@ -119,13 +116,13 @@ IF(SALOME_GEOM_USE_GUI)
   ELSE(EXISTS ${GUI_ROOT_DIR})
     MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, GEOM will be built without GUI!!!")
   ENDIF(EXISTS ${GUI_ROOT_DIR})
-  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(SalomeGUI SALOME_GEOM_USE_GUI)
-ENDIF(SALOME_GEOM_USE_GUI)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(SalomeGUI SALOME_BUILD_GUI)
+ENDIF(SALOME_BUILD_GUI)
 
 ##
 ## Prerequisites From GUI:
 ##
-IF(SALOME_GEOM_USE_GUI)
+IF(SALOME_BUILD_GUI)
   
   # Qt4
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
@@ -141,7 +138,7 @@ IF(SALOME_GEOM_USE_GUI)
     SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(VTK SALOME_USE_VTKVIEWER)
   ENDIF()
 
-ENDIF(SALOME_GEOM_USE_GUI)
+ENDIF(SALOME_BUILD_GUI)
 
 ##
 ## GEOM specifics
@@ -149,11 +146,13 @@ ENDIF(SALOME_GEOM_USE_GUI)
 
 FIND_PACKAGE(SalomeCAS REQUIRED)
 
-IF(SALOME_GEOM_USE_GUI)
+IF(SALOME_BUILD_GUI)
   # OpenCV
-  FIND_PACKAGE(OpenCV)
-ENDIF(SALOME_GEOM_USE_GUI)
-SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OPENCV SALOME_GEOM_USE_OPENCV)
+  FIND_PACKAGE(SalomeOpenCV)
+  SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV)
+ELSE()
+  SET(SALOME_GEOM_USE_OPENCV OFF)
+ENDIF(SALOME_BUILD_GUI)
 
 # Detection summary:
 SALOME_PACKAGE_REPORT()
@@ -226,13 +225,13 @@ SET(_${PROJECT_NAME}_exposed_targets
   GEOMUtils GEOMEngine GEOM_SupervEngine IGESExport IGESImport NMTDS NMTTools GEOMSketcher
   SalomeIDLGEOM STEPExport STEPImport STLExport ShHealOper
 )
-IF(SALOME_GEOM_USE_GUI)
+IF(SALOME_BUILD_GUI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
     AdvancedGUI BasicGUI BlocksGUI BooleanGUI BuildGUI DisplayGUI DlgRef EntityGUI GEOMBase
     GEOMFiltersSelection GEOM GEOMToolsGUI GenerationGUI GroupGUI Material MeasureGUI GEOMObject
     OCC2VTK VTKExport OperationGUI PrimitiveGUI RepairGUI TransformationGUI
     )
-ENDIF(SALOME_GEOM_USE_GUI)
+ENDIF(SALOME_BUILD_GUI)
 
 IF(SALOME_GEOM_USE_OPENCV)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
@@ -250,6 +249,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #      Ensure the variables are always defined for the configure:
 SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}")
 SET(OPENCV_ROOT_DIR "${OPENCV_ROOT_DIR}")
+SET(GUI_ROOT_DIR "$GUI_ROOT_DIR}")
 
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in