diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-02-04 14:20:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 14:20:25 (GMT) |
| commit | 8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d (patch) | |
| tree | b4882b25a68ac0d80a32252dfad5b905e9bcc5fd /hl/src | |
| parent | 674e1f02a3ac37cf3d57df1aee902b7af44f398e (diff) | |
| download | hdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.zip hdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.tar.gz hdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.tar.bz2 | |
1 10 merges from develop (#298)
* HDFFV-10865 - merge from dev, HDFArray perf fix.
* Remove duplicate setting
* Whitespace changes after clang format
* Undo version 11 clang format changes
* Merge CMake changes from develop
* test testing script merge from develop
* Update supported platforms
Diffstat (limited to 'hl/src')
| -rw-r--r-- | hl/src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index 91953b0..785bdcf 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -141,7 +141,7 @@ set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") configure_file ( - ${HDF_RESOURCES_DIR}/libhdf5.pc.in + ${HDF_CONFIG_DIR}/libhdf5.pc.in ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc @ONLY ) |