Merge remote-tracking branch 'remotes/origin/master'

[modules/shaper.git] / CMakeCommon / FindSUIT.cmake

diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake
index 260e4cedae08d92f5077e35a169fe5c3143c606a..3d6400c5323908cfe9618875ad987976ee59c473 100644 (file)
--- a/CMakeCommon/FindSUIT.cmake
+++ b/CMakeCommon/FindSUIT.cmake
@@ -1,7 +1,10 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 
 IF(HAVE_SALOME)
   SET(SUIT_INCLUDE ${SALOME_GUI_INCLUDE})
   MESSAGE(STATUS "SUIT_INCLUDE: ${SALOME_GUI_INCLUDE}")
+  SET(SUIT_LIB_DIR "${GUI_ROOT_DIR}/lib/salome")
 ELSE(HAVE_SALOME) 
   SET(SUIT_DIR $ENV{SUIT_DIR})
   IF(EXISTS ${SUIT_DIR})
@@ -18,6 +21,7 @@ ELSE(HAVE_SALOME)
     FIND_LIBRARY(PyInterp PyInterp ${SUIT_LIB_DIR})
     FIND_LIBRARY(qtx qtx ${SUIT_LIB_DIR})
     FIND_LIBRARY(suit suit ${SUIT_LIB_DIR})
+    FIND_LIBRARY(ViewerData ViewerData ${SUIT_LIB_DIR})
 
     IF(WIN32)
         SET(SUIT_INCLUDE ${SUIT_DIR}/include)