From: vsr <vsr@opencascade.com>
Date: Tue, 12 Jan 2016 10:00:32 +0000 (+0300)
Subject: Fix problem with detecting ParaView / VTK in PARAVIS module
X-Git-Tag: V8_0_0a2^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f3c57386fee9d058183137d83c4d2798c007c679;p=modules%2Fgui.git

Fix problem with detecting ParaView / VTK in PARAVIS module
---

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index 641eacac8..5a0b0334a 100644
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -144,18 +144,20 @@ IF(NOT _list_len EQUAL 0)
     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
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg})
+      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
+            COMPONENTS ${_compo_lst} 
+            PATHS "${_pkg_dir}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()