diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-20 04:23:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 04:23:50 (GMT) |
| commit | 6d881fe7755298d1c92c86d153b4f8097b86c483 (patch) | |
| tree | 506a43eb1d14b81d68aada1d62c9e62f5909a9aa /c++ | |
| parent | 59343e893185ef59f9fd93fd715a33ea4e125d7e (diff) | |
| download | hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.zip hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.tar.gz hdf5-6d881fe7755298d1c92c86d153b4f8097b86c483.tar.bz2 | |
Unify cmake and cmake_ext_mod like develop (#2596)
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/examples/CMakeTests.cmake | 5 | ||||
| -rw-r--r-- | c++/test/CMakeTests.cmake | 2 | ||||
| -rw-r--r-- | c++/test/CMakeVFDTests.cmake | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake index a7fc9b8..5145254 100644 --- a/c++/examples/CMakeTests.cmake +++ b/c++/examples/CMakeTests.cmake @@ -41,7 +41,7 @@ foreach (example ${examples}) -D "TEST_OUTPUT=cpp_ex_${example}.txt" #-D "TEST_REFERENCE=cpp_ex_${example}.out" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex) @@ -53,7 +53,6 @@ endforeach () #the following dependencies are handled by the order of the files # SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create) # SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds) - add_test ( NAME CPP_ex_tutr-clear-objects COMMAND ${CMAKE_COMMAND} @@ -80,7 +79,7 @@ foreach (example ${tutr_examples}) -D "TEST_OUTPUT=cpp_ex_${example}.txt" #-D "TEST_REFERENCE=cpp_ex_${example}.out" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (CPP_ex_${example} PROPERTIES FIXTURES_REQUIRED clear_cppex_tutr) diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 2a0a6be..e34f629 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -43,7 +43,7 @@ else () -D "TEST_OUTPUT=cpp_testhdf5.txt" #-D "TEST_REFERENCE=cpp_testhdf5.out" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" + -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) endif () set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects) diff --git a/c++/test/CMakeVFDTests.cmake b/c++/test/CMakeVFDTests.cmake index ced9b0c..3d6ab74 100644 --- a/c++/test/CMakeVFDTests.cmake +++ b/c++/test/CMakeVFDTests.cmake @@ -22,7 +22,6 @@ H5_CREATE_VFD_DIR() ### T H E T E S T S M A C R O S ### ############################################################################## ############################################################################## - macro (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) add_test ( |