Merge branch 'origin/akl/single_desktop'

[modules/gui.git] / SalomeGUIConfig.cmake.in

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index 0f7f4c1307545f593c0a76c4f196c3cd789b97cb..02a1e7d34118a4cf3e581363c8388bf66fc3ddf4 100644 (file)
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -61,6 +61,14 @@ SET(SALOME_USE_OCCVIEWER    @SALOME_USE_OCCVIEWER@)
 SET(SALOME_USE_GLVIEWER     @SALOME_USE_GLVIEWER@)
 SET(SALOME_USE_VTKVIEWER    @SALOME_USE_VTKVIEWER@)
 SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@)
+SET(SALOME_USE_SINGLE_DESKTOP @SALOME_USE_SINGLE_DESKTOP@)
+IF(SALOME_USE_SINGLE_DESKTOP)
+  LIST(APPEND GUI_DEFINITIONS "-DSINGLE_DESKTOP")
+ENDIF()
+SET(SALOME_GUI_USE_OBSERVERS @SALOME_GUI_USE_OBSERVERS@)
+IF(SALOME_GUI_USE_OBSERVERS)
+  LIST(APPEND GUI_DEFINITIONS "-DWITH_SALOMEDS_OBSERVER")
+ENDIF()
 
 # Level 1 prerequisites:
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
@@ -88,7 +96,7 @@ SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
 SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
 LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
 IF(NOT _list_len EQUAL 0)
-# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
+  # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
   MATH(EXPR _range "${_list_len}-1")
   FOREACH(_p RANGE ${_range})  
     LIST(GET _PREREQ            ${_p} _pkg    )
@@ -169,6 +177,7 @@ SET(GUI_suit suit)
 SET(GUI_SVTK SVTK)
 SET(GUI_ToolsGUI ToolsGUI)
 SET(GUI_ViewerTools ViewerTools)
+SET(GUI_ViewerData ViewerData)
 SET(GUI_VTKViewer VTKViewer)
 SET(GUI_vtkEDFOverloads vtkEDFOverloads)
 SET(GUI_vtkTools vtkTools)