Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / MEDCoupling_Swig / CMakeLists.txt

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index b3f700daedb1514d46c9edf712ee96892cd32f71..ed16b352325728bb3272fd7b3813be8f7c9b8faf 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -22,7 +22,11 @@ INCLUDE(${SWIG_USE_FILE})
 ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS})
 
 SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
+  SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_FLAGS "-py3")
+ELSE()
+  SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+ENDIF()
 SET(SWIG_MODULE_MEDCoupling_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
 
 SET (MEDCoupling_SWIG_DPYS_FILES
@@ -37,24 +41,27 @@ SET (MC_pyTestFiles
     MEDCouplingBasicsTest2.py
     MEDCouplingBasicsTest3.py
     MEDCouplingBasicsTest4.py
-    MEDCouplingBasicsTest5.py 
-    MEDCouplingRemapperTest.py 
-    MEDCouplingDataForTest.py 
-    MEDCouplingNumPyTest.py 
+    MEDCouplingBasicsTest5.py
+    MEDCouplingBasicsTest6.py
+    MEDCouplingIntersectTest.py
+    MEDCouplingRemapperTest.py
+    MEDCouplingDataForTest.py
+    MEDCouplingNumPyTest.py
     MEDCouplingPickleTest.py
 )
 
 SET (MC_Swig_interf
-    MEDCoupling.i 
-    MEDCouplingCommon.i 
-    MEDCouplingRefCountObject.i 
-    MEDCouplingMemArray.i 
-    MEDCouplingFieldDiscretization.i 
-    MEDCouplingTimeDiscretization.i 
-    MEDCouplingFinalize.i 
-    MEDCouplingRemapper.i 
-    MEDCouplingTypemaps.i 
+    MEDCoupling.i
+    MEDCouplingCommon.i
+    MEDCouplingRefCountObject.i
+    MEDCouplingMemArray.i
+    MEDCouplingFieldDiscretization.i
+    MEDCouplingTimeDiscretization.i
+    MEDCouplingFinalize.i
+    MEDCouplingRemapper.i
+    MEDCouplingTypemaps.i
     MEDCouplingDataArrayTypemaps.i
+    MEDCouplingDataArrayTraits.hxx
 )
 
 INCLUDE_DIRECTORIES(
@@ -88,9 +95,13 @@ ENDIF()
 
 SWIG_ADD_MODULE(MEDCoupling python MEDCoupling.i)
 SWIG_LINK_LIBRARIES(MEDCoupling ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medcoupling)
-
+SWIG_CHECK_GENERATION(MEDCoupling)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
+  SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_FLAGS "-py3")
+ELSE()
+  SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+ENDIF()
 SET(SWIG_MODULE_MEDCouplingRemapper_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
 
 # _ABR_ Ensure dependency mechanism on all SWIG files and headers
@@ -126,6 +137,10 @@ ADD_TEST(MEDCouplingBasicsTest4 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
 SET_TESTS_PROPERTIES(MEDCouplingBasicsTest4 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(MEDCouplingBasicsTest5 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingBasicsTest5.py)
 SET_TESTS_PROPERTIES(MEDCouplingBasicsTest5 PROPERTIES ENVIRONMENT "${tests_env}")
+ADD_TEST(MEDCouplingBasicsTest6 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingBasicsTest6.py)
+SET_TESTS_PROPERTIES(MEDCouplingBasicsTest6 PROPERTIES ENVIRONMENT "${tests_env}")
+ADD_TEST(MEDCouplingIntersectTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingIntersectTest.py)
+SET_TESTS_PROPERTIES(MEDCouplingIntersectTest PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(MEDCouplingExamplesTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingExamplesTest.py)
 SET_TESTS_PROPERTIES(MEDCouplingExamplesTest PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(MEDCouplingRemapperTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingRemapperTest.py)
@@ -140,7 +155,7 @@ ENDIF(NUMPY_FOUND)
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling/MEDCoupling_Swig)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling_Swig)
 LIST(APPEND MC_pyTestFiles MEDCouplingExamplesTest.py)
 INSTALL(FILES ${MC_pyTestFiles} DESTINATION ${TEST_INSTALL_DIRECTORY})