diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-02-01 20:52:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-02-01 20:52:44 (GMT) |
| commit | be955c5e792ff642c259c25999a86c6007682019 (patch) | |
| tree | 23b6dda252e605008b4c83ce4452453f1b9842da /config | |
| parent | c4142e07ddd04a97f1039900192bc18dca969dfc (diff) | |
| parent | 3c169f947382da170c8589f6c00896a9c4ea8e6c (diff) | |
| download | hdf5-be955c5e792ff642c259c25999a86c6007682019.zip hdf5-be955c5e792ff642c259c25999a86c6007682019.tar.gz hdf5-be955c5e792ff642c259c25999a86c6007682019.tar.bz2 | |
Merge pull request #277 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3c169f947382da170c8589f6c00896a9c4ea8e6c':
HDFFV-10123 Use generator expression
HDFFV-10123 fix shared name
HDFFV-10123 Add SHARED tools
HDFFV-10046 add shared versions of tools for plugin filters
HDFFV-10046 build a shared version of h5repack tool for plugins
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 67a92d1..23fd6b2 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -43,10 +43,9 @@ endmacro () #------------------------------------------------------------------------------- macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent) if (WIN32 AND MSVC) - get_target_property (target_name ${libtarget} OUTPUT_NAME_RELWITHDEBINFO) install ( FILES - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${target_name}.pdb + $<TARGET_PDB_FILE:${libtarget}> DESTINATION ${targetdestination} CONFIGURATIONS RelWithDebInfo @@ -58,11 +57,9 @@ endmacro () #------------------------------------------------------------------------------- macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent) if (WIN32 AND MSVC) - get_target_property (target_name ${progtarget} OUTPUT_NAME_RELWITHDEBINFO) - get_target_property (target_prefix ${progtarget} PREFIX) install ( FILES - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target_prefix}${target_name}.pdb + $<TARGET_PDB_FILE:${progtarget}> DESTINATION ${targetdestination} CONFIGURATIONS RelWithDebInfo |