From f8b721b6bcd4f2acd05275abafade2f5250cb19b Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Mon, 8 Feb 2021 17:00:39 +0100 Subject: [PATCH] Make salome test runnable independantly from MEDCOUPLING_USE_MPI value --- src/CMakeLists.txt | 6 +++--- ...TestfileInstall.cmake => CTestTestfileInstall.cmake.in} | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) rename src/{CTestTestfileInstall.cmake => CTestTestfileInstall.cmake.in} (89%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ebae2bd8e..768a16751 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,6 +70,6 @@ IF(MEDCOUPLING_USE_MPI) ENDIF(MEDCOUPLING_USE_MPI) # Application tests -INSTALL(FILES CTestTestfileInstall.cmake - DESTINATION ${MEDCOUPLING_INSTALL_TESTS} - RENAME CTestTestfile.cmake) +configure_file(CTestTestfileInstall.cmake.in "CTestTestfileST.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileST.cmake DESTINATION ${MEDCOUPLING_INSTALL_TESTS} RENAME CTestTestfile.cmake) + diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake.in similarity index 89% rename from src/CTestTestfileInstall.cmake rename to src/CTestTestfileInstall.cmake.in index 063453338..76061c75c 100644 --- a/src/CTestTestfileInstall.cmake +++ b/src/CTestTestfileInstall.cmake.in @@ -26,7 +26,12 @@ SUBDIRS(MEDCoupling_Swig) SUBDIRS(MEDLoader) SUBDIRS(MEDLoader_Swig) SUBDIRS(MEDPartitioner) -SUBDIRS(ParaMEDMEMTest) + +set(MEDCOUPLING_USE_MPI_BOOL $) +if(MEDCOUPLING_USE_MPI_BOOL) + SUBDIRS(ParaMEDMEMTest) +endif() + SUBDIRS(MEDPartitioner_Swig) SUBDIRS(RENUMBER_Swig) SUBDIRS(PyWrapping) -- 2.39.2