diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-10 15:32:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-10 15:32:43 (GMT) |
| commit | ede618741953c9ff70f9a0f3a0d22e7c92043437 (patch) | |
| tree | eb3616bb22813377a6effbdfd92de03f0158b33c | |
| parent | 2f88d439c647e9c8e9d9c670224936fc2941c787 (diff) | |
| download | hdf5-ede618741953c9ff70f9a0f3a0d22e7c92043437.zip hdf5-ede618741953c9ff70f9a0f3a0d22e7c92043437.tar.gz hdf5-ede618741953c9ff70f9a0f3a0d22e7c92043437.tar.bz2 | |
Fix note text and cmake module include
| -rw-r--r-- | config/cmake_ext_mod/FindSZIP.cmake | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake_ext_mod/FindSZIP.cmake b/config/cmake_ext_mod/FindSZIP.cmake index 152f8ac..b84d768 100644 --- a/config/cmake_ext_mod/FindSZIP.cmake +++ b/config/cmake_ext_mod/FindSZIP.cmake @@ -57,7 +57,7 @@ endforeach() if(NOT SZIP_LIBRARY) find_library(SZIP_LIBRARY_RELEASE NAMES ${szip_names}) find_library(SZIP_LIBRARY_DEBUG NAMES ${szip_names_debug}) - include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + include(SelectLibraryConfigurations) select_library_configurations(SZIP) mark_as_advanced(SZIP_LIBRARY_RELEASE SZIP_LIBRARY_DEBUG) endif() diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 72a3fb1..01d8658 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -63,7 +63,7 @@ New Features shared. A new option was added to CMake, ONLY_SHARED_LIBS, which will skip building static libraries. Certain utility functions will build with static libs but are not published. Tests are adjusted to use the correct - libraries. + libraries depending on SHARED/STATIC settings. (ADB - 2019/06/12, HDFFV-10805) @@ -82,8 +82,8 @@ New Features - Change tools test that test the error stack There are some use cases which can cause the error stack of tools to be - different then the expected. These tests now use grepTest.cmake, this was - changed to allow the error file to be searched for an expected string. + different then the expected output. These tests now use grepTest.cmake, + this was changed to allow the error file to be searched for an expected string. (ADB - 2019/04/15, HDFFV-10741) |