Merge branch 'V9_9_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8064b103d79896f6555a6372067ec3b813898614..aae5bce0ce4e9b854136effa170f4244f1c1dfdc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.9.0)
+SALOME_SETUP_VERSION(9.9.0 DEVELOPMENT)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Platform setup
@@ -90,8 +90,9 @@ OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
 OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
 OPTION(MEDCOUPLING_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
 OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF)
-OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
-OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
+OPTION(MEDCOUPLING_BUILD_TESTS "Build MEDCoupling C++ tests." ON)
+OPTION(MEDCOUPLING_BUILD_PY_TESTS "Build MEDCoupling Python tests." ON)
+OPTION(MEDCOUPLING_BUILD_DOC "Build MEDCoupling doc." ON)
 OPTION(MEDCOUPLING_BUILD_STATIC "Build MEDCoupling library in static mode." OFF)
 OPTION(MEDCOUPLING_USE_64BIT_IDS "Size of IDs to refer cells and nodes. 32 bits when OFF (default), 64 bits when ON." ON)
 
@@ -283,7 +284,7 @@ IF(WIN32)
   ADD_DEFINITIONS("-D_USE_MATH_DEFINES")
 ENDIF(WIN32)
 
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(adm_local)

diff --git a/src/ICoCo/Swig/CMakeLists.txt b/src/ICoCo/Swig/CMakeLists.txt
index fcc389dbb53dd882949d3e481859aab0a82056c5..99c4ac8003131b69fca9ead09e5ff0afdc16d4b0 100644 (file)
--- a/src/ICoCo/Swig/CMakeLists.txt
+++ b/src/ICoCo/Swig/CMakeLists.txt
@@ -24,7 +24,9 @@
 # (see PyWrapping source directory)
 #
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../../PyWrapping)
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)

diff --git a/src/ICoCo/Swig/CTestTestfileInstall.cmake b/src/ICoCo/Swig/CTestTestfileInstall.cmake
index f43a931d49f7aaacb14d1a4d401319f69c1cd087..fe222f611b6cafb3a73fe56b14f41a24a4b99c41 100644 (file)
--- a/src/ICoCo/Swig/CTestTestfileInstall.cmake
+++ b/src/ICoCo/Swig/CTestTestfileInstall.cmake
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 FOREACH(tfile ${ALL_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index 9f36a0b48041b4a54b806d1491e4a3b447aa7f44..738a087ec7879c39caf1a3e7279a5d3963c9c949 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -16,8 +16,9 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 INCLUDE(${SWIG_USE_FILE})
 

diff --git a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
index f43a931d49f7aaacb14d1a4d401319f69c1cd087..fe222f611b6cafb3a73fe56b14f41a24a4b99c41 100644 (file)
--- a/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
+++ b/src/MEDCoupling_Swig/CTestTestfileInstall.cmake
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 FOREACH(tfile ${ALL_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)

diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
index f52e61ab27a591718ab019ad78b200032f51bf35..1af409fac95a6e03b053e87cdd89f1c7f3c8448c 100644 (file)
--- a/src/MEDLoader/Swig/CMakeLists.txt
+++ b/src/MEDLoader/Swig/CMakeLists.txt
@@ -21,7 +21,9 @@
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS})
 

diff --git a/src/MEDLoader/Swig/CTestTestfileInstall.cmake b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
index f43a931d49f7aaacb14d1a4d401319f69c1cd087..fe222f611b6cafb3a73fe56b14f41a24a4b99c41 100644 (file)
--- a/src/MEDLoader/Swig/CTestTestfileInstall.cmake
+++ b/src/MEDLoader/Swig/CTestTestfileInstall.cmake
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 FOREACH(tfile ${ALL_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)

diff --git a/src/MEDPartitioner_Swig/CMakeLists.txt b/src/MEDPartitioner_Swig/CMakeLists.txt
index fcaa9fdef38d70360f22a7c3f9def5288cb3d363..9f83cfede822f614518b9fca8adeafba0e028cde 100644 (file)
--- a/src/MEDPartitioner_Swig/CMakeLists.txt
+++ b/src/MEDPartitioner_Swig/CMakeLists.txt
@@ -77,12 +77,14 @@ INSTALL(FILES MEDPartitioner.i MEDPartitionerCommon.i DESTINATION ${MEDCOUPLING_
 INSTALL(FILES MEDPartitionerTest.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_PYTHON})
 
 IF(MEDCOUPLING_PARTITIONER_METIS)
-   # Python test of partitionner require METIS or PARMETIS?
-   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../MEDLoader/Swig)
-   SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
-   ADD_TEST(MEDPartitionerTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDPartitionerTest.py)
-   SET_TESTS_PROPERTIES(MEDPartitionerTest PROPERTIES ENVIRONMENT "${tests_env}")
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader/Swig/MEDLoaderDataForTest.py ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+    IF(MEDCOUPLING_BUILD_PY_TESTS)
+       # Python test of partitionner require METIS or PARMETIS?
+       SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../MEDLoader/Swig)
+       SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+       ADD_TEST(MEDPartitionerTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDPartitionerTest.py)
+       SET_TESTS_PROPERTIES(MEDPartitionerTest PROPERTIES ENVIRONMENT "${tests_env}")
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader/Swig/MEDLoaderDataForTest.py ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+    ENDIF()
 ENDIF()
 
 # Application tests

diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt
index 23ea668b947238e31610eeb418f890c5c0329012..47320923d5cba54972c064cec4f977660ba2986d 100644 (file)
--- a/src/ParaMEDMEM_Swig/CMakeLists.txt
+++ b/src/ParaMEDMEM_Swig/CMakeLists.txt
@@ -70,39 +70,41 @@ SWIG_CHECK_GENERATION(ParaMEDMEM)
 #
 # Tests
 #
-SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../PyWrapping)
-SALOME_ACCUMULATE_ENVIRONMENT(MED_RESOURCES_DIR NOCHECK ${CMAKE_SOURCE_DIR}/resources)
-SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
-
-#  -- some tests require 2, 3, 4 or 5 procs --
-# MPICH does not support --oversubscribe:
-IF(NOT ${MPIEXEC_EXECUTABLE} MATCHES "mpich")
-    SET(_oversub_opt "--oversubscribe")
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../PyWrapping)
+    SALOME_ACCUMULATE_ENVIRONMENT(MED_RESOURCES_DIR NOCHECK ${CMAKE_SOURCE_DIR}/resources)
+    SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+    
+    #  -- some tests require 2, 3, 4 or 5 procs --
+    # MPICH does not support --oversubscribe:
+    IF(NOT ${MPIEXEC_EXECUTABLE} MATCHES "mpich")
+        SET(_oversub_opt "--oversubscribe")
+    ENDIF()
+    
+    ADD_TEST(NAME PyPara_Basics_Proc2
+             COMMAND ${MPIEXEC} -np 2  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_BasicOperation.py)
+    SET_TESTS_PROPERTIES(PyPara_Basics_Proc2 PROPERTIES ENVIRONMENT "${tests_env}")
+    
+    ADD_TEST(NAME PyPara_InterpKernelDEC_Proc4
+             COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_InterpKernelDEC.py)
+    SET_TESTS_PROPERTIES(PyPara_InterpKernelDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
+    ADD_TEST(NAME PyPara_InterpKernelDEC_Proc5
+             COMMAND ${MPIEXEC} -np 5  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_InterpKernelDEC.py)
+    SET_TESTS_PROPERTIES(PyPara_InterpKernelDEC_Proc5 PROPERTIES ENVIRONMENT "${tests_env}")
+    
+    #ADD_TEST(NAME PyPara_NonCoincidentDEC_Proc5
+    #         COMMAND ${MPIEXEC} -np 5  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_NonCoincidentDEC.py)
+    #SET_TESTS_PROPERTIES(PyPara_NonCoincidentDEC_Proc5 PROPERTIES ENVIRONMENT "${tests_env}")
+    
+    ADD_TEST(NAME PyPara_StructuredCoincidentDEC_Proc4
+             COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_StructuredCoincidentDEC.py)
+    SET_TESTS_PROPERTIES(PyPara_StructuredCoincidentDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
+    
+    ADD_TEST(NAME PyPara_OverlapDEC_Proc4
+             COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_OverlapDEC.py)
+    SET_TESTS_PROPERTIES(PyPara_OverlapDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
 ENDIF()
 
-ADD_TEST(NAME PyPara_Basics_Proc2
-         COMMAND ${MPIEXEC} -np 2  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_BasicOperation.py)
-SET_TESTS_PROPERTIES(PyPara_Basics_Proc2 PROPERTIES ENVIRONMENT "${tests_env}")
-
-ADD_TEST(NAME PyPara_InterpKernelDEC_Proc4
-         COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_InterpKernelDEC.py)
-SET_TESTS_PROPERTIES(PyPara_InterpKernelDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
-ADD_TEST(NAME PyPara_InterpKernelDEC_Proc5
-         COMMAND ${MPIEXEC} -np 5  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_InterpKernelDEC.py)
-SET_TESTS_PROPERTIES(PyPara_InterpKernelDEC_Proc5 PROPERTIES ENVIRONMENT "${tests_env}")
-
-#ADD_TEST(NAME PyPara_NonCoincidentDEC_Proc5
-#         COMMAND ${MPIEXEC} -np 5  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_NonCoincidentDEC.py)
-#SET_TESTS_PROPERTIES(PyPara_NonCoincidentDEC_Proc5 PROPERTIES ENVIRONMENT "${tests_env}")
-
-ADD_TEST(NAME PyPara_StructuredCoincidentDEC_Proc4
-         COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_StructuredCoincidentDEC.py)
-SET_TESTS_PROPERTIES(PyPara_StructuredCoincidentDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
-
-ADD_TEST(NAME PyPara_OverlapDEC_Proc4
-         COMMAND ${MPIEXEC} -np 4  ${_oversub_opt} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_OverlapDEC.py)
-SET_TESTS_PROPERTIES(PyPara_OverlapDEC_Proc4 PROPERTIES ENVIRONMENT "${tests_env}")
-
 SET(_tst_scripts
   test_InterpKernelDEC.py
   test_NonCoincidentDEC.py

diff --git a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
index b9b44fa8285d06ad83329ee9f3a17dcd918c44df..38d3c04a19be6e69410a12337625eafe18287fa4 100644 (file)
--- a/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
+++ b/src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
@@ -25,27 +25,32 @@ SET(TEST_NAMES ParaMEDMEMTest)
 # force mpiexec to use PATH env var to detect right python into mpiexec command line
 set(PATH_FOR_PYTHON $ENV{PATH})
 
-set(tfile PyPara_Basics_Proc2)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
-add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_BasicOperation.py)
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
-
-set(tfile PyPara_InterpKernelDEC_Proc4)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
-add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
-
-set(tfile PyPara_InterpKernelDEC_Proc5)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
-add_test(${TEST_NAME} ${MPIEXEC} -np 5 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
-
-set(tfile PyPara_StructuredCoincidentDEC_Proc4)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
-add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_StructuredCoincidentDEC.py)
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
-
-set(tfile PyPara_OverlapDEC_Proc4)
-set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
-add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_OverlapDEC.py)
-set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+
+
+    set(tfile PyPara_Basics_Proc2)
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    add_test(${TEST_NAME} ${MPIEXEC} -np 2 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_BasicOperation.py)
+    set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+    
+    set(tfile PyPara_InterpKernelDEC_Proc4)
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
+    set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+    
+    set(tfile PyPara_InterpKernelDEC_Proc5)
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    add_test(${TEST_NAME} ${MPIEXEC} -np 5 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_InterpKernelDEC.py)
+    set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+    
+    set(tfile PyPara_StructuredCoincidentDEC_Proc4)
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_StructuredCoincidentDEC.py)
+    set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+    
+    set(tfile PyPara_OverlapDEC_Proc4)
+    set(TEST_NAME ${COMPONENT_NAME}_${TEST_NAMES}_${tfile})
+    add_test(${TEST_NAME} ${MPIEXEC} -np 4 ${_oversub_opt} -path "${PATH_FOR_PYTHON}" python3 test_OverlapDEC.py)
+    set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}" TIMEOUT ${TIMEOUT})
+
+ENDIF()
\ No newline at end of file

diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt
index 204bb3996a4a0fbf77490c084a53a949a17779ff..2543ae374b6d923fe4b1f18a09c786fcccadf512 100644 (file)
--- a/src/PyWrapping/CMakeLists.txt
+++ b/src/PyWrapping/CMakeLists.txt
@@ -113,7 +113,11 @@ INSTALL(TARGETS _medcoupling DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 INSTALL(FILES medcoupling.i medcoupling_pycode DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/medcoupling.py ${MEDCOUPLING_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_medcoupling_REAL_NAME}")
 
-INCLUDE(tests.set)
+
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
+
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
 
 FOREACH(test ${BASE_TESTS})

diff --git a/src/PyWrapping/CTestTestfileInstall.cmake b/src/PyWrapping/CTestTestfileInstall.cmake
index 66d982bf3af9bca98d8b65acd8b7c70b3341ae43..37c275f286aade6bc8b7bcd87337c261e5217c31 100644 (file)
--- a/src/PyWrapping/CTestTestfileInstall.cmake
+++ b/src/PyWrapping/CTestTestfileInstall.cmake
@@ -17,7 +17,9 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(tests.set)
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    INCLUDE(tests.set)
+ENDIF()
 
 FOREACH(tfile ${BASE_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)

diff --git a/src/RENUMBER_Swig/CMakeLists.txt b/src/RENUMBER_Swig/CMakeLists.txt
index 36d17782e37307b878fd83f906e09386f8101f69..9c09ef7cefe0be410b2563436436865de43886f0 100644 (file)
--- a/src/RENUMBER_Swig/CMakeLists.txt
+++ b/src/RENUMBER_Swig/CMakeLists.txt
@@ -78,13 +78,15 @@ SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/MEDRenumber.py ${MEDCOUPLING_
 INSTALL(FILES MEDRenumber.i MEDRenumberCommon.i MEDRenumberImpl.i DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 INSTALL(FILES MEDRenumberTest.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_PYTHON})
 
-SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../PyWrapping)
-SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
-ADD_TEST(MEDRenumberTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDRenumberTest.py)
-SET_TESTS_PROPERTIES(MEDRenumberTest PROPERTIES ENVIRONMENT "${tests_env}")
-IF(MEDCOUPLING_ENABLE_PARTITIONER)
-  ADD_TEST(MEDRenumberUserGuide ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/UsersGuideExamplesTest.py)
-  SET_TESTS_PROPERTIES(MEDRenumberUserGuide PROPERTIES ENVIRONMENT "${tests_env}")
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_CURRENT_BINARY_DIR}/../PyWrapping)
+    SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+    ADD_TEST(MEDRenumberTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDRenumberTest.py)
+    SET_TESTS_PROPERTIES(MEDRenumberTest PROPERTIES ENVIRONMENT "${tests_env}")
+    IF(MEDCOUPLING_ENABLE_PARTITIONER)
+      ADD_TEST(MEDRenumberUserGuide ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/UsersGuideExamplesTest.py)
+      SET_TESTS_PROPERTIES(MEDRenumberUserGuide PROPERTIES ENVIRONMENT "${tests_env}")
+    ENDIF()
 ENDIF()
 
 # Application tests

diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
index 09e57cacf3df2a67776b5a1f2b6e34abfce288e0..e25efe589bf1bc7ade269d3a2ccbb34a6f9d9008 100644 (file)
--- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake
+++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
@@ -21,20 +21,22 @@ SET(TEST_NAMES
   MEDRenumberTest
 )
 
-FOREACH(tfile ${TEST_NAMES})
-  SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
-  ADD_TEST(${TEST_NAME} python ${tfile}.py)
-  SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-    LABELS "${COMPONENT_NAME}"
-    TIMEOUT ${TIMEOUT}
-    ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
-    )
-ENDFOREACH()
-
-SET(TEST_NAME ${COMPONENT_NAME}_RENUMBER_Swig_MEDRenumberUserGuide)
-ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py)
-SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
-  LABELS "${COMPONENT_NAME}"
-  TIMEOUT ${TIMEOUT}
-  ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
+IF(MEDCOUPLING_BUILD_PY_TESTS)
+    FOREACH(tfile ${TEST_NAMES})
+      SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
+      ADD_TEST(${TEST_NAME} python ${tfile}.py)
+      SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+        LABELS "${COMPONENT_NAME}"
+        TIMEOUT ${TIMEOUT}
+        ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
+        )
+    ENDFOREACH()
+    
+    SET(TEST_NAME ${COMPONENT_NAME}_RENUMBER_Swig_MEDRenumberUserGuide)
+    ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py)
+    SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+      LABELS "${COMPONENT_NAME}"
+      TIMEOUT ${TIMEOUT}
+      ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
   )
+ENDIF()