diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-03-20 18:00:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 18:00:00 (GMT) |
| commit | 1ffaa38174b0f784b7ed6a471f40bf0e749ceac3 (patch) | |
| tree | 7862edd79409afc7806996f166aa6bb7cd2088e9 /examples | |
| parent | c01e27cd8ea443a6ddf68ca1052a491692e28ae9 (diff) | |
| download | hdf5-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 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/CMakeTests.cmake | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 83edbc4..1e05572 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -50,7 +50,7 @@ endif () foreach (example ${examples}) add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c) - target_include_directories (${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + target_include_directories (${example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (${example} STATIC) target_link_libraries (${example} PRIVATE ${HDF5_LIB_TARGET}) @@ -71,7 +71,7 @@ endforeach () if (H5_HAVE_PARALLEL) foreach (parallel_example ${parallel_examples}) add_executable (${parallel_example} ${HDF5_EXAMPLES_SOURCE_DIR}/${parallel_example}.c) - target_include_directories (${parallel_example} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") + target_include_directories (${parallel_example} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (${parallel_example} STATIC) target_link_libraries (${parallel_example} PRIVATE ${HDF5_LIB_TARGET} MPI::MPI_C) diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake index 6c84d1d..a3bcd47 100644 --- a/examples/CMakeTests.cmake +++ b/examples/CMakeTests.cmake @@ -83,7 +83,6 @@ if (HDF5_TEST_SERIAL) -D "TEST_EXPECT=0" -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${example}.txt" - #-D "TEST_REFERENCE=${example}.out" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -P "${HDF_RESOURCES_DIR}/runTest.cmake" ) @@ -113,7 +112,6 @@ if (H5_HAVE_PARALLEL AND HDF5_TEST_PARALLEL AND NOT WIN32) -D "TEST_SKIP_COMPARE=TRUE" -D "TEST_OUTPUT=${parallel_example}.out" -D "TEST_REFERENCE:STRING=PHDF5 example finished with no errors" - #-D "TEST_FILTER:STRING=PHDF5 tests finished with no errors" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -P "${HDF_RESOURCES_DIR}/grepTest.cmake" ) |