From: eap <eap@opencascade.com>
Date: Mon, 15 Feb 2016 13:41:21 +0000 (+0300)
Subject: Fix compilation pb relating to numpy
X-Git-Tag: V7_8_0a2~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=40276fe1f56729b8affec0dc83860220f2fc1271;p=modules%2Fkernel.git

Fix compilation pb relating to numpy
---

diff --git a/salome_adm/cmake_files/FindSalomePythonInterp.cmake b/salome_adm/cmake_files/FindSalomePythonInterp.cmake
index 9028f26ce..03dc0c626 100644
--- a/salome_adm/cmake_files/FindSalomePythonInterp.cmake
+++ b/salome_adm/cmake_files/FindSalomePythonInterp.cmake
@@ -56,8 +56,7 @@ IF(SALOMEPYTHONINTERP_FOUND)
     SET(NUMPY_FOUND TRUE)
   ENDIF(NUMPY_INCLUDE_DIR)
   IF(NUMPY_FOUND)
-    SET(PYTHON_INCLUDE_DIRS ${NUMPY_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})
-    SET(PYTHON_DEFINITIONS "${PYTHON_DEFINITIONS} -DWITH_NUMPY")
+    SET(NUMPY_DEFINITIONS "-DWITH_NUMPY")
     MESSAGE(STATUS "NumPy found : ${NUMPY_INCLUDE_DIR}")
   ELSE(NUMPY_FOUND)
     MESSAGE(STATUS "NumPy not found.")
diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt
index 04e81be6b..1fc731327 100755
--- a/src/DSC/DSC_Python/CMakeLists.txt
+++ b/src/DSC/DSC_Python/CMakeLists.txt
@@ -22,11 +22,12 @@ INCLUDE(${SWIG_USE_FILE})
 
 SET_SOURCE_FILES_PROPERTIES(calcium.i PROPERTIES CPLUSPLUS ON)
 SET(CMAKE_SWIG_FLAGS "-noexcept")
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS} ${NUMPY_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
+  ${NUMPY_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm