Porting to SALOME_8.2.0 : SHAPERGUI module

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 4d8c40d3eaf3fabe16ea437a9f8817716d2ee33e..80c3e1c41484a24a388dc3926ab56ede6152fc1b 100644 (file)
--- 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 204f6c1f9eb4e23ffe6e859061a8a90fc21fa9e7..9f7d4620c7e9b1aeb94bb1c1dca74e8376c9034e 100644 (file)
--- 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 2d8de0559cf94e8b249de25957f09259036c5e22..7fc1a2df924d1fb9eda2a738bc7e81a8a96af8d1 100644 (file)
--- 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})