X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeCommon%2FFindSUIT.cmake;h=dcb58c0cf3fdae8dc75701529331f85e98d6e9fb;hb=c4cf14b971c784b9269ab37c0ea75e9c6b5bfcd7;hp=54940d7d49842357a92f6048b203f65f49ff2b49;hpb=96ff1d1fb2acb842cee193f15492de81060a1d58;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake
index 54940d7d4..dcb58c0cf 100644
--- a/CMakeCommon/FindSUIT.cmake
+++ b/CMakeCommon/FindSUIT.cmake
@@ -1,14 +1,48 @@
+# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
-SET(SUIT_DIR $ENV{SUIT_DIR} CACHE PATH "Path to the SUIT libraries")
-IF(EXISTS ${SUIT_DIR})
-	MESSAGE("-- SUIT found at " ${SUIT_DIR})
+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})
 
-	FIND_LIBRARY(Event Event ${SUIT_DIR}/lib)
-	FIND_LIBRARY(PyConsole PyConsole ${SUIT_DIR}/lib)
-	FIND_LIBRARY(PyInterp PyInterp ${SUIT_DIR}/lib)
-	FIND_LIBRARY(qtx qtx ${SUIT_DIR}/lib)
-	FIND_LIBRARY(suit suit ${SUIT_DIR}/lib)
+    MESSAGE(STATUS "SUIT found at ${SUIT_DIR}")
+    IF(WIN32)
+        SET(SUIT_LIB_DIR ${SUIT_DIR}/lib)
+    ElSE()
+        SET(SUIT_LIB_DIR ${SUIT_DIR}/lib/salome)
+    ENDIF()
 
-	SET(SUIT_INCLUDE ${SUIT_DIR}/include)
-	
-ENDIF(EXISTS ${SUIT_DIR})
+    FIND_LIBRARY(Event Event ${SUIT_LIB_DIR})
+    FIND_LIBRARY(PyConsole PyConsole ${SUIT_LIB_DIR})
+    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)
+    ElSE()
+        SET(SUIT_INCLUDE ${SUIT_DIR}/include/salome)
+    ENDIF()
+  ENDIF(EXISTS ${SUIT_DIR})
+ENDIF(HAVE_SALOME)