From: Gilles DAVID Date: Wed, 26 Apr 2017 06:43:45 +0000 (+0200) Subject: [PY3] Update with branch gdd/py3 for Medcoupling X-Git-Tag: V9_0_0~5^2~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=29d82895c2236eac754d132ee05267ce9c97d19c;p=modules%2Fmed.git [PY3] Update with branch gdd/py3 for Medcoupling Definition of USE_PYTHON3 is no longer needed. --- diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt index 8833bb745..9e2aa50be 100644 --- a/src/MEDCalculator/Swig/CMakeLists.txt +++ b/src/MEDCalculator/Swig/CMakeLists.txt @@ -19,9 +19,6 @@ # Author : Anthony Geay (CEA/DEN) ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS}) -IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3") - ADD_DEFINITIONS(-DUSE_PYTHON3) -ENDIF() FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt index 8d9c2ae34..9a9dfeb74 100644 --- a/src/MEDCouplingCorba_Swig/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt @@ -21,9 +21,6 @@ ADD_SUBDIRECTORY(Client) ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS}) -IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3") - ADD_DEFINITIONS(-DUSE_PYTHON3) -ENDIF() FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt index fd974c157..9bac858be 100644 --- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt @@ -19,9 +19,6 @@ # Author : Anthony Geay (CEA/DEN) ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS}) -IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3") - ADD_DEFINITIONS(-DUSE_PYTHON3) -ENDIF() FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE})