From d85e2d93668a70f7905554a162da64ad199dc5ec Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 7 Dec 2023 08:33:07 -0600 Subject: [PATCH] Correct CMake command and example packaging --- CMakeInstallation.cmake | 2 +- tools/test/h5copy/CMakeTests.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 2b03779fc89..f28bb949965 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -156,7 +156,7 @@ if (HDF5_PACK_EXAMPLES) ) install ( - DIRECTORY ${HDF5_BINARY_DIR}/HDF5Examples + DIRECTORY ${HDF5_SOURCE_DIR}/HDF5Examples DESTINATION ${HDF5_INSTALL_DATA_DIR} USE_SOURCE_PERMISSIONS COMPONENT hdfdocuments diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake index fb02d81883d..b4daa87c8ed 100644 --- a/tools/test/h5copy/CMakeTests.cmake +++ b/tools/test/h5copy/CMakeTests.cmake @@ -163,8 +163,8 @@ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $ -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 -v -s ${psparam} -d ${pdparam} ) set_tests_properties (H5COPY-${testname}-prefill PROPERTIES DEPENDS H5COPY-${testname}-clear-objects) - if ("" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") - set_tests_properties ( PROPERTIES DISABLED true) + if ("H5COPY-${testname}-prefill" MATCHES "${HDF5_DISABLE_TESTS_REGEX}") + set_tests_properties (H5COPY-${testname}-prefill PROPERTIES DISABLED true) endif () add_test (