0022439: [CEA 1026] The YACS panels are persistant when changing module

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

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index 667c5af938d93201153d7a421068dbf958c66d3f..22754b5a3985dc8ef9425a2acb107c80acd17ce7 100644 (file)
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -87,26 +87,28 @@ SET(_PREREQ @_PREREQ_LIST@)
 SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
 SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
 LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-# 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    )
-  LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-  LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-  MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-  IF(NOT _pkg_compo)
-    FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
+IF(NOT _list_len EQUAL 0)
+  # 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    )
+    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
+    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
+    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
+    IF(NOT _pkg_compo)
+      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
           PATHS "${_pkg_dir}" 
           NO_DEFAULT_PATH)
-  ELSE()
-    STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-    MESSAGE(STATUS "===> (components ${_pkg_compo})")
-    FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
+    ELSE()
+      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
+      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
+      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
           COMPONENTS ${_compo_lst} 
           PATHS "${_pkg_dir}"
           NO_DEFAULT_PATH)
-  ENDIF()
-ENDFOREACH()
+    ENDIF()
+  ENDFOREACH()
+ENDIF()
 
 # Installation directories
 SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@")
@@ -167,6 +169,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)