From 153592f72c15cd441ae24b8174508f08a147d85f Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Mon, 21 Aug 2017 10:32:49 -0400
Subject: [PATCH] CMake: Remove dependency searching from tests
---
testing/adios2/engine/adios1/CMakeLists.txt | 23 ++++++++-------------
testing/adios2/engine/bp/CMakeLists.txt | 7 +++----
testing/adios2/engine/hdf5/CMakeLists.txt | 10 ++++++---
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/testing/adios2/engine/adios1/CMakeLists.txt b/testing/adios2/engine/adios1/CMakeLists.txt
index c31059b07..ace06e557 100644
--- a/testing/adios2/engine/adios1/CMakeLists.txt
+++ b/testing/adios2/engine/adios1/CMakeLists.txt
@@ -3,20 +3,15 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
-if(NOT ADIOS2_HAVE_MPI)
- find_package(ADIOS1 COMPONENTS sequential REQUIRED)
-else()
- find_package(ADIOS1 REQUIRED)
-endif()
-
add_executable(TestADIOS1WriteRead TestADIOS1WriteRead.cpp)
target_link_libraries(TestADIOS1WriteRead adios2 gtest adios1::adios)
-
-if(NOT ADIOS2_HAVE_MPI)
- gtest_add_tests(TARGET TestADIOS1WriteRead)
-else()
- # MPI versions of the test
- gtest_add_tests(TARGET TestADIOS1WriteRead EXEC_WRAPPER ${MPIEXEC}
- ${MPIEXEC_NUMPROC_FLAG}
- ${MPIEXEC_MAX_NUMPROCS})
+if(ADIOS2_HAVE_MPI)
+ target_include_directories(TestADIOS1WriteRead PRIVATE ${MPI_C_INCLUDE_PATH})
+ target_link_libraries(TestADIOS1WriteRead ${MPI_C_LIBRARIES})
+ set(extra_test_args
+ EXEC_WRAPPER
+ ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
+ )
endif()
+
+gtest_add_tests(TARGET TestADIOS1WriteRead ${extra_test_args})
diff --git a/testing/adios2/engine/bp/CMakeLists.txt b/testing/adios2/engine/bp/CMakeLists.txt
index 3153fd2ab..2d6c49e5b 100644
--- a/testing/adios2/engine/bp/CMakeLists.txt
+++ b/testing/adios2/engine/bp/CMakeLists.txt
@@ -7,8 +7,6 @@
if(NOT ADIOS2_HAVE_MPI)
if(ADIOS2_HAVE_ADIOS1)
- find_package(ADIOS1 COMPONENTS sequential REQUIRED)
-
add_executable(TestBPWriteRead TestBPWriteRead.cpp)
target_link_libraries(TestBPWriteRead adios2 gtest adios1::adios)
@@ -21,11 +19,12 @@ if(NOT ADIOS2_HAVE_MPI)
gtest_add_tests(TARGET TestBPWriteRead)
gtest_add_tests(TARGET TestBPWriteReadstdio)
gtest_add_tests(TARGET TestBPWriteReadfstream)
-
endif()
add_executable(TestBPWriteProfilingJSON TestBPWriteProfilingJSON.cpp)
- target_link_libraries(TestBPWriteProfilingJSON adios2 gtest gtest_main NLohmannJson)
+ target_link_libraries(TestBPWriteProfilingJSON
+ adios2 gtest gtest_main NLohmannJson
+ )
gtest_add_tests(TARGET TestBPWriteProfilingJSON)
endif()
diff --git a/testing/adios2/engine/hdf5/CMakeLists.txt b/testing/adios2/engine/hdf5/CMakeLists.txt
index 9847eaee6..e13c17fb6 100644
--- a/testing/adios2/engine/hdf5/CMakeLists.txt
+++ b/testing/adios2/engine/hdf5/CMakeLists.txt
@@ -3,10 +3,14 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
-find_package(HDF5 REQUIRED)
-
add_executable(TestHDF5WriteRead TestHDF5WriteRead.cpp)
-target_include_directories(TestHDF5WriteRead PRIVATE ${HDF5_C_INCLUDE_DIRS})
+
+# Workaround for multiple versions of FindHDF5
+if(HDF5_C_INCLUDE_DIRS)
+ target_include_directories(TestHDF5WriteRead PRIVATE ${HDF5_C_INCLUDE_DIRS})
+else()
+ target_include_directories(TestHDF5WriteRead PRIVATE ${HDF5_INCLUDE_DIRS})
+endif()
target_link_libraries(TestHDF5WriteRead adios2 gtest ${HDF5_C_LIBRARIES})
gtest_add_tests(TARGET TestHDF5WriteRead)
--
GitLab