Adaptative maintenance of MED for new SalomePyConsole.

[modules/med.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51725d58f532fcf15b5d170480c0f890408e37bc..9c44fa5955fc22e91b4182510893d3e22cbb51ef 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,17 @@ IF(SALOME_BUILD_GUI)
     FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 ENDIF(SALOME_BUILD_GUI)
 
+IF(SALOME_MED_ENABLE_PYTHON)
+  FIND_PACKAGE(SalomePythonInterp)
+  FIND_PACKAGE(SalomePythonLibs)
+  FIND_PACKAGE(SalomeNumPySciPy)
+  FIND_PACKAGE(SalomeSWIG)
+  SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp SALOME_MED_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs SALOME_MED_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(SWIG   SALOME_MED_ENABLE_PYTHON)
+  FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
+ENDIF(SALOME_MED_ENABLE_PYTHON)
+
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
@@ -119,22 +130,6 @@ IF(SALOME_USE_MPI)
   ADD_DEFINITIONS("-DHAVE_MPI")
 ENDIF(SALOME_USE_MPI)
 
-IF(SALOME_MED_ENABLE_PYTHON)
-  FIND_PACKAGE(SalomePython)
-  FIND_PACKAGE(SalomeSWIG)
-  SALOME_LOG_OPTIONAL_PACKAGE(Python SALOME_MED_ENABLE_PYTHON)
-  SALOME_LOG_OPTIONAL_PACKAGE(SWIG   SALOME_MED_ENABLE_PYTHON)
-  FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-  # 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)
-
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   FIND_PACKAGE(SalomeGraphviz)