From: Anthony Geay <anthony.geay@edf.fr>
Date: Mon, 8 Feb 2021 16:00:39 +0000 (+0100)
Subject: Make salome test runnable independantly from MEDCOUPLING_USE_MPI value
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f8b721b6bcd4f2acd05275abafade2f5250cb19b;p=tools%2Fmedcoupling.git

Make salome test runnable independantly from MEDCOUPLING_USE_MPI value
---

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
deleted file mode 100644
index 063453338..000000000
--- a/src/CTestTestfileInstall.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2015-2020  CEA/DEN, EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-SET(COMPONENT_NAME MEDCOUPLING)
-SET(TIMEOUT        120)
-
-SUBDIRS(INTERP_KERNELTest)
-SUBDIRS(MEDCoupling)
-SUBDIRS(MEDCoupling_Swig)
-SUBDIRS(MEDLoader)
-SUBDIRS(MEDLoader_Swig)
-SUBDIRS(MEDPartitioner)
-SUBDIRS(ParaMEDMEMTest)
-SUBDIRS(MEDPartitioner_Swig)
-SUBDIRS(RENUMBER_Swig)
-SUBDIRS(PyWrapping)
diff --git a/src/CTestTestfileInstall.cmake.in b/src/CTestTestfileInstall.cmake.in
new file mode 100644
index 000000000..76061c75c
--- /dev/null
+++ b/src/CTestTestfileInstall.cmake.in
@@ -0,0 +1,37 @@
+# Copyright (C) 2015-2020  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+SET(COMPONENT_NAME MEDCOUPLING)
+SET(TIMEOUT        120)
+
+SUBDIRS(INTERP_KERNELTest)
+SUBDIRS(MEDCoupling)
+SUBDIRS(MEDCoupling_Swig)
+SUBDIRS(MEDLoader)
+SUBDIRS(MEDLoader_Swig)
+SUBDIRS(MEDPartitioner)
+
+set(MEDCOUPLING_USE_MPI_BOOL $<BOOL:@MEDCOUPLING_USE_MPI@>)
+if(MEDCOUPLING_USE_MPI_BOOL)
+    SUBDIRS(ParaMEDMEMTest)
+endif()
+
+SUBDIRS(MEDPartitioner_Swig)
+SUBDIRS(RENUMBER_Swig)
+SUBDIRS(PyWrapping)