X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FCMakeLists.txt;h=9ae0519e91df7b45c0e7f22a85d4883bc137c60a;hb=d426837c21eca9b56b9b8a7a7434aaf3969c8977;hp=b3f700daedb1514d46c9edf712ee96892cd32f71;hpb=79386ac5c73f8365c428b8ef595c4ef004959667;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt index b3f700dae..9ae0519e9 100644 --- a/src/MEDCoupling_Swig/CMakeLists.txt +++ b/src/MEDCoupling_Swig/CMakeLists.txt @@ -37,23 +37,24 @@ SET (MC_pyTestFiles MEDCouplingBasicsTest2.py MEDCouplingBasicsTest3.py MEDCouplingBasicsTest4.py - MEDCouplingBasicsTest5.py - MEDCouplingRemapperTest.py - MEDCouplingDataForTest.py - MEDCouplingNumPyTest.py + MEDCouplingBasicsTest5.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 ) @@ -88,7 +89,7 @@ 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") SET(SWIG_MODULE_MEDCouplingRemapper_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}") @@ -126,6 +127,8 @@ 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(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 +143,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})