diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-02-02 18:09:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-02-02 18:09:10 (GMT) |
| commit | 177c050891d979ec1197e68bf3ca7dd3148cb08b (patch) | |
| tree | d4e1329e41af6f1c9d96fb10c03eefe48c619fc0 /config | |
| parent | be955c5e792ff642c259c25999a86c6007682019 (diff) | |
| download | hdf5-177c050891d979ec1197e68bf3ca7dd3148cb08b.zip hdf5-177c050891d979ec1197e68bf3ca7dd3148cb08b.tar.gz hdf5-177c050891d979ec1197e68bf3ca7dd3148cb08b.tar.bz2 | |
HDFFV-9875 Fix target exports and add static tools pdb files
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 23fd6b2..dac5635 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -43,9 +43,17 @@ endmacro () #------------------------------------------------------------------------------- macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent) if (WIN32 AND MSVC) + get_target_property (target_type ${libtarget} TYPE) + if (target_type MATCHES "STATIC_LIBRARY") + get_property (target_name TARGET ${libtarget} PROPERTY OUTPUT_NAME_RELWITHDEBINFO) + get_property (target_dir TARGET ${libtarget} PROPERTY COMPILE_PDB_OUTPUT_DIRECTORY) + set (targetfilename ${target_dir}/${target_name}.pdb) + else () + set (targetfilename $<TARGET_PDB_FILE:${libtarget}>) + endif () install ( FILES - $<TARGET_PDB_FILE:${libtarget}> + ${targetfilename}> DESTINATION ${targetdestination} CONFIGURATIONS RelWithDebInfo @@ -95,6 +103,15 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype) OUTPUT_NAME_MINSIZEREL ${LIB_RELEASE_NAME} OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME} ) + if (WIN32 AND NOT ${libtype} MATCHES "SHARED") + set_target_properties (${libtarget} + PROPERTIES + COMPILE_PDB_NAME_DEBUG ${LIB_DEBUG_NAME} + COMPILE_PDB_NAME_RELEASE ${LIB_RELEASE_NAME} + COMPILE_PDB_NAME_MINSIZEREL ${LIB_RELEASE_NAME} + COMPILE_PDB_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME} + ) + endif () #----- Use MSVC Naming conventions for Shared Libraries if (MINGW AND ${libtype} MATCHES "SHARED") |