From: nds <nds@opencascade.com>
Date: Wed, 21 Dec 2016 10:43:58 +0000 (+0300)
Subject: Porting to SALOME_8.2.0 : SHAPERGUI module
X-Git-Tag: V_2.7.0~351^2~55^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=788513e92cb85baa8bb303f3b2b36a65e7db0d4e;p=modules%2Fshaper.git

Porting to SALOME_8.2.0 : SHAPERGUI module
---

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 4d8c40d3e..80c3e1c41 100644
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -127,10 +127,13 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
                     ${SUIT_INCLUDE}
 )
 
-IF(NOT ${HAVE_SALOME})
+IF(${HAVE_SALOME})
+  INCLUDE_DIRECTORIES(${SALOME_KERNEL_INCLUDE})
+ELSE(${HAVE_SALOME})
   INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR})
 ENDIF(NOT ${HAVE_SALOME})
 
+
 ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(PartSet SHARED
 	${PROJECT_SOURCES}
diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt
index 204f6c1f9..9f7d4620c 100644
--- a/src/SHAPERGUI/CMakeLists.txt
+++ b/src/SHAPERGUI/CMakeLists.txt
@@ -63,6 +63,10 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
                     ${CAS_INCLUDE_DIRS}
 )
 
+IF(${HAVE_SALOME})
+  INCLUDE_DIRECTORIES(${SALOME_KERNEL_INCLUDE})
+ENDIF(${HAVE_SALOME})
+
 ADD_LIBRARY(SHAPER SHARED
 	${PROJECT_SOURCES}
 	${PROJECT_HEADERS}
diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 2d8de0559..7fc1a2df9 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -132,6 +132,10 @@ SET(PROJECT_INCLUDES
     ${CAS_INCLUDE_DIRS}
     ${SUIT_INCLUDE})
 
+IF(${HAVE_SALOME})
+  INCLUDE_DIRECTORIES(${SALOME_KERNEL_INCLUDE})
+ENDIF(${HAVE_SALOME})
+
 IF(${VInspectorAPI})
     message("VINSPECTOR is defined")
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VInspectorAPI})