diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 18:51:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-14 18:51:00 (GMT) |
| commit | 6de1836e477ddfa255812df8325405a741e002f4 (patch) | |
| tree | 0a1500ba37e175353ca1f626c1fca217ecdbcb8a /config/cmake | |
| parent | f0a356a90324e9542b2272df7e695a5a365dbb13 (diff) | |
| parent | 321db89a65909c02d7279fed7e8b7a3585cde8da (diff) | |
| download | hdf5-6de1836e477ddfa255812df8325405a741e002f4.zip hdf5-6de1836e477ddfa255812df8325405a741e002f4.tar.gz hdf5-6de1836e477ddfa255812df8325405a741e002f4.tar.bz2 | |
Merge pull request #2 in ~BYRN/hdf5_adb from bugfix/HDFFV-10003-examples-project-fails-to-build to develop
* commit '321db89a65909c02d7279fed7e8b7a3585cde8da':
Remove test only tools from exports
Fix typo
Correct typo in variable format
Description: Fixed typo that caused daily test failed when --enable-deprecated-symbols is used. Also, removed a commented-out function. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) with --enable-deprecated-symbols
Description: Added test file titerate.cpp. Platform tested: Verified with bin/chkmanifest
Description: Removed commented out lines. Platform tested Jam (only comments)
Purpose: Fix bug HDFFR-9920 cont. Description: Added new test file titerate.cpp.
Fix:HDFFV-9987 With HDF5-1.10 you cannot specify default dataspace for Fortran (H5S_ALL_F)
Removed unused H5T_NATIVE_INTEGER_# variables due to NAG fixes.
Purpose: Updated documentation Description: Revised class brief description and other comments for up-to-date info. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Purpose: Fix bug HDFFR-9920 cont. Description: Adding user's test revealed a flaw in the fix. Moved CommonFG's functions in Group to H5Location, so that they could be called by objects that can be used to specify a location Also, rearranged many "#include" header files to resolve conflicts.
Add support for namespace and add tools to binaries config
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index 3f95d76..41fc726 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -157,12 +157,12 @@ foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE) else () set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 1) string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_${libtype}_LIBRARY COMP_LIBRARY) - set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp2}-${libtype} ${hdf5_comp}-${libtype}) + set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @HDF5_PACKAGE@::${hdf5_comp2}-${libtype} @HDF5_PACKAGE@::${hdf5_comp}-${libtype}) endif () else () set (${HDF5_PACKAGE_NAME}_${libtype}_${comp}_FOUND 1) string(TOUPPER ${HDF5_PACKAGE_NAME}_${comp}_${libtype}_LIBRARY COMP_LIBRARY) - set (${COMP_LIBRARY} ${${COMP_LIBRARY}} ${hdf5_comp}-${libtype}) + set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @HDF5_PACKAGE@::${hdf5_comp}-${libtype}) endif () endif () endforeach () |