diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2013-04-11 22:12:12 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-04-11 22:12:12 (GMT) |
| commit | 4ce17c9aa6515c32551104516b32caf8b0ce9f02 (patch) | |
| tree | ca2237566b5b729f4d6a4545ffb2909d9d31309f /config/cmake | |
| parent | 5185d3a76aff8288d8eaceff31b483cbf897619e (diff) | |
| download | hdf5-4ce17c9aa6515c32551104516b32caf8b0ce9f02.zip hdf5-4ce17c9aa6515c32551104516b32caf8b0ce9f02.tar.gz hdf5-4ce17c9aa6515c32551104516b32caf8b0ce9f02.tar.bz2 | |
[svn-r23577] Bring revisions 22708:22730 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 568b3ff..099b97f 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -34,18 +34,18 @@ 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") - SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll") + SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll") 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 @@ -58,10 +58,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 @@ -121,16 +121,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}" |