Fix compilation pb relating to numpy

diff --git a/salome_adm/cmake_files/FindSalomePythonInterp.cmake b/salome_adm/cmake_files/FindSalomePythonInterp.cmake
index 9028f26ce3d21541e6b861c595515f9600397303..03dc0c626e97cd8a26770644b8dbcb9462f9a76a 100644 (file)
--- 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 04e81be6bc06333d0f3585d000ce011f386cb2a2..1fc731327e011fac4ac56154f0eeae3c02c89a7d 100755 (executable)
--- 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