diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-08-28 17:38:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-08-28 17:38:44 (GMT) |
| commit | 5336fb2d01ad741a36d771745282130099710309 (patch) | |
| tree | 0b9d2756240c7d031120f44e0a6c43aa159925ab /config/cmake/HDFMacros.cmake | |
| parent | 8b271f6ca5761cfe1c22ea7d7a240e779ed73f08 (diff) | |
| download | hdf5-5336fb2d01ad741a36d771745282130099710309.zip hdf5-5336fb2d01ad741a36d771745282130099710309.tar.gz hdf5-5336fb2d01ad741a36d771745282130099710309.tar.bz2 | |
[svn-r22719] Fix RelWithDebInfo packaging
Tested: windows
Diffstat (limited to 'config/cmake/HDFMacros.cmake')
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 5e0fcdc..499c227 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -34,23 +34,23 @@ MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES) ENDMACRO (IDE_SOURCE_PROPERTIES) #------------------------------------------------------------------------------- -MACRO (TARGET_NAMING target libtype) +MACRO (TARGET_NAMING libtarget libtype) IF (WIN32) IF (${libtype} MATCHES "SHARED") IF (HDF_LEGACY_NAMING) - SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll") - SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}") + SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "dll") + SET_TARGET_PROPERTIES (${libtarget} PROPERTIES PREFIX "${libtarget}") ELSE (HDF_LEGACY_NAMING) - SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll") + SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll") ENDIF (HDF_LEGACY_NAMING) ENDIF (${libtype} MATCHES "SHARED") ENDIF (WIN32) ENDMACRO (TARGET_NAMING) #------------------------------------------------------------------------------- -MACRO (INSTALL_TARGET_PDB target targetdestination targetcomponent) +MACRO (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent) IF (WIN32 AND MSVC) - GET_TARGET_PROPERTY (target_name ${target} RELWITHDEBINFO_OUTPUT_NAME) + GET_TARGET_PROPERTY (target_name ${libtarget} RELWITHDEBINFO_OUTPUT_NAME) INSTALL ( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${target_name}.pdb @@ -63,10 +63,10 @@ MACRO (INSTALL_TARGET_PDB target targetdestination targetcomponent) ENDMACRO (INSTALL_TARGET_PDB) #------------------------------------------------------------------------------- -MACRO (INSTALL_PROGRAM_PDB target targetdestination targetcomponent) +MACRO (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent) IF (WIN32 AND MSVC) - GET_TARGET_PROPERTY (target_name ${target} RELWITHDEBINFO_OUTPUT_NAME) - GET_TARGET_PROPERTY (target_prefix h5dump PREFIX) + GET_TARGET_PROPERTY (target_name ${progtarget} RELWITHDEBINFO_OUTPUT_NAME) + GET_TARGET_PROPERTY (target_prefix ${progtarget} PREFIX) INSTALL ( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target_prefix}${target_name}.pdb @@ -136,16 +136,16 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype) ENDMACRO (HDF_SET_LIB_OPTIONS) #------------------------------------------------------------------------------- -MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags) +MACRO (TARGET_FORTRAN_WIN_PROPERTIES forttarget addlinkflags) IF (WIN32 AND MSVC) IF (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (${target} + SET_TARGET_PROPERTIES (${forttarget} PROPERTIES COMPILE_FLAGS "/dll" LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}" ) ELSE (BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (${target} + SET_TARGET_PROPERTIES (${forttarget} PROPERTIES COMPILE_FLAGS "/MD" LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}" |