From: ageay <ageay>
Date: Tue, 26 Nov 2013 10:21:00 +0000 (+0000)
Subject: Split Numpy and Scipy detection
X-Git-Tag: V7_3_1b1~51
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4883b22a9c36be443666543fc190bd4329a43e69;p=tools%2Fmedcoupling.git

Split Numpy and Scipy detection
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index feb00d5e1..e43611172 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,14 @@ IF(SALOME_MED_ENABLE_PYTHON)
   IF(NOT SALOME_MED_STANDALONE)
     FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   ENDIF(NOT SALOME_MED_STANDALONE)
+  # Set the extra flags for SWIG for numpy and scipy
+  SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY)
+  IF(NUMPY_FOUND)
+    SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "-DWITH_NUMPY")
+  ENDIF(NUMPY_FOUND)
+  IF(SCIPY_FOUND)
+    SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY")
+  ENDIF(SCIPY_FOUND)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
 
 # Detection report