Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for the #2716 comment 3 : make smash allow sub-solids selected, but "Apply" butto...
[modules/shaper.git]
/
CMakeCommon
/
FindSUIT.cmake
diff --git
a/CMakeCommon/FindSUIT.cmake
b/CMakeCommon/FindSUIT.cmake
index daca7d986e6eae89ee8a09a9dd4e1ac51b30648b..3d6400c5323908cfe9618875ad987976ee59c473 100644
(file)
--- a/
CMakeCommon/FindSUIT.cmake
+++ b/
CMakeCommon/FindSUIT.cmake
@@
-1,6
+1,13
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-SET(SUIT_DIR $ENV{SUIT_DIR})
-IF(EXISTS ${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})
MESSAGE(STATUS "SUIT found at ${SUIT_DIR}")
IF(WIN32)
MESSAGE(STATUS "SUIT found at ${SUIT_DIR}")
IF(WIN32)
@@
-14,11
+21,12
@@
IF(EXISTS ${SUIT_DIR})
FIND_LIBRARY(PyInterp PyInterp ${SUIT_LIB_DIR})
FIND_LIBRARY(qtx qtx ${SUIT_LIB_DIR})
FIND_LIBRARY(suit suit ${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()
IF(WIN32)
SET(SUIT_INCLUDE ${SUIT_DIR}/include)
ElSE()
SET(SUIT_INCLUDE ${SUIT_DIR}/include/salome)
ENDIF()
-
-ENDIF(
EXISTS ${SUIT_DIR}
)
+ ENDIF(EXISTS ${SUIT_DIR})
+ENDIF(
HAVE_SALOME
)