summaryrefslogtreecommitdiffstats
path: root/hl/c++/test
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-03-20 18:00:00 (GMT)
committerGitHub <noreply@github.com>2023-03-20 18:00:00 (GMT)
commit1ffaa38174b0f784b7ed6a471f40bf0e749ceac3 (patch)
tree7862edd79409afc7806996f166aa6bb7cd2088e9 /hl/c++/test
parentc01e27cd8ea443a6ddf68ca1052a491692e28ae9 (diff)
downloadhdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.zip
hdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.tar.gz
hdf5-1ffaa38174b0f784b7ed6a471f40bf0e749ceac3.tar.bz2
Gather latest CMake changes from develop (#2609)
Add HDF5_SRC_INCLUDE_DIRS variable cleanup cmake comments and documentation
Diffstat (limited to 'hl/c++/test')
-rw-r--r--hl/c++/test/CMakeLists.txt2
-rw-r--r--hl/c++/test/CMakeTests.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 9a1d6fd..fb750dd 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -3,7 +3,7 @@ project (HDF5_HL_CPP_TEST CXX)
add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
target_compile_options(hl_ptableTest PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
-target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+target_include_directories (hl_ptableTest PRIVATE "${HDF5_HL_SRC_DIR}/test;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (hl_ptableTest STATIC)
target_link_libraries (hl_ptableTest PRIVATE
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 5abbd47..8b5dde3 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -21,6 +21,7 @@ add_test (
COMMAND ${CMAKE_COMMAND}
-E remove ${example}.txt
)
+
if (HDF5_ENABLE_USING_MEMCHECKER)
add_test (NAME HL_CPP_ptableTest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:hl_ptableTest>)
else ()