From: Nicolas Geimer <nicolas.geimer@edf.fr>
Date: Wed, 15 Mar 2017 14:36:55 +0000 (+0100)
Subject: [PY3] Needs OmniORBpy includes for LifeCycleCorba_SWIG
X-Git-Tag: V9_0_0~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5c3e4225b1ebe6cccccd2e04e5aa526e9e868d39;p=tools%2Fconfiguration.git

[PY3] Needs OmniORBpy includes for LifeCycleCorba_SWIG
---

diff --git a/cmake/FindOmniORBPy.cmake b/cmake/FindOmniORBPy.cmake
index b1c4e6d..7ef2780 100644
--- a/cmake/FindOmniORBPy.cmake
+++ b/cmake/FindOmniORBPy.cmake
@@ -39,10 +39,17 @@ FIND_PATH(OMNIORB_PYTHON_BACKEND
   PATH_SUFFIXES "/lib/python${_py_version}/site-packages/omniidl_be" "/lib/omniidl/omniidl_be" "/lib/python/omniidl_be"
   DOC "Path to python-backend directory (omniidl_be) including python.py file")
 
+FIND_PATH(OMNIORBPY_INCLUDE_DIR
+  NAMES omniORBpy.h
+  PATHS "${OMNIORBPY_ROOT_DIR}" "/usr"
+  PATHS_SUFFIXES "/include"
+  DOC "Path to omniORBpy include directory")
+
 ##############################################################################
 # Cook our stuff
 ##############################################################################
 MARK_AS_ADVANCED(OMNIORB_PYTHON_BACKEND)
+MARK_AS_ADVANCED(OMNIORBPY_INCLUDE_DIR)
   
 SET(OMNIORB_IDLPYFLAGS)
 IF (OMNIORB_PYTHON_BACKEND) 
@@ -54,4 +61,4 @@ GET_FILENAME_COMPONENT(OMNIORBPY_PYTHONPATH "${OMNIORB_PYTHON_BACKEND}" PATH)
 
 # Handle standard arguments:
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OmniORBPy REQUIRED_VARS OMNIORB_PYTHON_BACKEND)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OmniORBPy REQUIRED_VARS OMNIORB_PYTHON_BACKEND OMNIORBPY_INCLUDE_DIR)
diff --git a/cmake/FindSalomeOmniORBPy.cmake b/cmake/FindSalomeOmniORBPy.cmake
index 881d10b..93197ae 100644
--- a/cmake/FindSalomeOmniORBPy.cmake
+++ b/cmake/FindSalomeOmniORBPy.cmake
@@ -50,6 +50,7 @@ ELSE()
 ENDIF()
 
 IF(OMNIORBPY_FOUND)
+  SALOME_ACCUMULATE_HEADERS(${OMNIORBPY_INCLUDE_DIR})
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORBPY_LIBRARIES})
   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_LIBRARIES}
                                            ${OMNIORBPY_PYTHONPATH})