From: ndjinga <michael.ndjinga@cea.fr>
Date: Thu, 1 Oct 2020 13:35:28 +0000 (+0200)
Subject: Reverted correction of medCoupling9.5 bug as bug has been corrected in medCoupling9.6
X-Git-Tag: V9_6_0~37
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ae17be2ffe5253455141b35e0b41bdecad4ac1f7;p=tools%2Fsolverlab.git

Reverted correction of medCoupling9.5 bug as bug has been corrected in medCoupling9.6
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e053c9c..229bf0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,6 @@ list (APPEND CMAKE_MODULE_PATH "${SOLVERLAB_SOURCE_DIR}/cmake_files")
 
 include(ExternalProject)#For PETSc, MED and MEDCoupling
 
-ADD_DEFINITIONS(-DWITH_NUMPY)
-
 ######################################################
 # Detection or compilation of PETSc+SLEPc+HDF5       #
 ######################################################
@@ -418,9 +416,6 @@ ELSE (${CMAKE_VERSION} VERSION_GREATER "3.12.0")
   set(Python_VERSION_MINOR ${PYTHON_VERSION_MINOR})
 ENDIF(${CMAKE_VERSION} VERSION_GREATER "3.12.0")
 
-# Bug MEDCoupling9.5.0 -> On ajoute les include de numpy
-set(Python_INCLUDE_DIRS  ${Python_INCLUDE_DIRS} $ENV{PYTHON_ROOT_DIR}/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/numpy/core/include)
-
 #Paraview library paths
 set (PV_LIB_DIR    /usr/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/dist-packages/paraview/:/usr/lib64/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/vtk/:${PARAVIEW_LIBRARIES_DIR})
 set (PV_PYTHON_DIR /usr/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/dist-packages/paraview/:/usr/lib64/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/vtk/:/usr/lib64/paraview/site-packages/:/usr/lib64/paraview/site-packages/paraview/:/usr/lib64/paraview/site-packages/vtk/:/usr/lib64/paraview/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/:/usr/lib64/paraview/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/paraview/:/usr/lib64/paraview/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/vtkmodules:/usr/lib/paraview/site-packages/paraview:/usr/lib/paraview/site-packages/paraview/vtk)