summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-07-19 04:26:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-07-19 04:26:47 (GMT)
commit6ef69f058de959c126e80b172c4674e1f1b01b73 (patch)
tree1155b70f06c10736c0207a017a3c682a669cab18
parent0f2c1b8126075b2a1652644e5f529f83b771a52c (diff)
parent6add0919d1dd737a7d9a2da25079d761a85f282e (diff)
downloadhdf5-6ef69f058de959c126e80b172c4674e1f1b01b73.zip
hdf5-6ef69f058de959c126e80b172c4674e1f1b01b73.tar.gz
hdf5-6ef69f058de959c126e80b172c4674e1f1b01b73.tar.bz2
Merge branch 'develop' into gnu-flags-work
-rw-r--r--config/cmake_ext_mod/HDFMacros.cmake2
-rw-r--r--release_docs/RELEASE.txt9
2 files changed, 10 insertions, 1 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 52b96fc..0a4598d 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -73,7 +73,7 @@ endmacro ()
#-------------------------------------------------------------------------------
macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
- if (WIN32 AND MSVC)
+ if (WIN32 AND MSVC AND NOT DISABLE_PDB_FILES)
get_target_property (target_type ${libtarget} TYPE)
if (${libtype} MATCHES "SHARED")
set (targetfilename $<TARGET_PDB_FILE:${libtarget}>)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 01d8658..6be1d7f 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -48,6 +48,15 @@ New Features
Configuration:
-------------
+ - Windows PDB files are always installed
+
+ There are configuration settings for Windows, that may not generate
+ PDB files. As such the install utility will break because those files
+ are not found. Add an optional variable that can be set to not install
+ PDB files.
+
+ (ADB - 2019/07/17, HDFFV-100424)
+
- Windows PDB files are installed incorrectly
For static builds, the PDB files for windows should be installed next