X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeCommon%2FFindSUIT.cmake;h=30cd6e9702f93f59b38867a990c6e6a08eac87f1;hb=1645fa6ee78759da4a75b15a382261d28683f771;hp=54940d7d49842357a92f6048b203f65f49ff2b49;hpb=34a92fc418be76c4fb5fa5a442d6725f38d9503e;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake
index 54940d7d4..30cd6e970 100644
--- a/CMakeCommon/FindSUIT.cmake
+++ b/CMakeCommon/FindSUIT.cmake
@@ -1,14 +1,30 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-SET(SUIT_DIR $ENV{SUIT_DIR} CACHE PATH "Path to the SUIT libraries")
-IF(EXISTS ${SUIT_DIR})
-	MESSAGE("-- SUIT found at " ${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)
+IF(HAVE_SALOME)
+  SET(SUIT_INCLUDE ${SALOME_GUI_INCLUDE})
+  MESSAGE(STATUS "SUIT_INCLUDE: ${SALOME_GUI_INCLUDE}")
+ELSE(HAVE_SALOME) 
+  SET(SUIT_DIR $ENV{SUIT_DIR})
+  IF(EXISTS ${SUIT_DIR})
 
-	SET(SUIT_INCLUDE ${SUIT_DIR}/include)
-	
-ENDIF(EXISTS ${SUIT_DIR})
+    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()
+
+    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})
+
+    IF(WIN32)
+        SET(SUIT_INCLUDE ${SUIT_DIR}/include)
+    ElSE()
+        SET(SUIT_INCLUDE ${SUIT_DIR}/include/salome)
+    ENDIF()
+  ENDIF(EXISTS ${SUIT_DIR})
+ENDIF(HAVE_SALOME)