mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22479] Remove subfolder tools from install command

Browse Source
This commit is contained in:
Allen Byrne 2012-06-20 09:43:02 -05:00
parent d0347999e6
commit b608652f7e
11 changed files with 30 additions and 36 deletions

2
hl/tools/CMakeLists.txt

@ -54,7 +54,7 @@ INSTALL (
gif2h5
h52gif
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
hltoolsapplications
)

4
tools/h5copy/CMakeLists.txt

@ -375,13 +375,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5copy
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

8
tools/h5diff/CMakeLists.txt

@ -1429,26 +1429,26 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5diff
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)
IF (H5_HAVE_PARALLEL)
INSTALL_PROGRAM_PDB (ph5diff ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (ph5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
ph5diff
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5dump/CMakeLists.txt

@ -1758,13 +1758,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5dump
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5import/CMakeLists.txt

@ -262,13 +262,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5import
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5jam/CMakeLists.txt

@ -535,13 +535,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5jam h5unjam
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5ls/CMakeLists.txt

@ -434,13 +434,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5ls
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5repack/CMakeLists.txt

@ -899,13 +899,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5repack
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

4
tools/h5stat/CMakeLists.txt

@ -206,13 +206,13 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5stat
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)

13
tools/lib/CMakeLists.txt

@ -75,19 +75,6 @@ IF (APPLE)
ENDIF (HDF5_BUILD_WITH_INSTALL_NAME)
ENDIF (APPLE)
IF (MSVC)
GET_TARGET_PROPERTY (target_name ${HDF5_TOOLS_LIB_TARGET} RELWITHDEBINFO_OUTPUT_NAME)
MESSAGE (STATUS "target_name is ${target_name} with config ${CMAKE_BUILD_TYPE}")
INSTALL (
FILES
${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${target_name}.pdb
DESTINATION
${HDF5_INSTALL_LIB_DIR}
CONFIGURATIONS RelWithDebInfo
COMPONENT toolslibraries
)
ENDIF (MSVC)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
#-----------------------------------------------------------------------------

15
tools/misc/CMakeLists.txt

@ -31,6 +31,13 @@ SET (H5_DEP_EXECUTABLES
h5mkgrp
)
#-----------------------------------------------------------------------------
# Generate the h5cc file containing settings needed to compile programs
#-----------------------------------------------------------------------------
#IF (NOT WIN32)
# CONFIGURE_FILE (${HDF5_TOOLS_MISC_SOURCE_DIR}/h5cc.in ${HDF5_BINARY_DIR}/h5cc @ONLY)
#ENDIF (NOT WIN32)
##############################################################################
##############################################################################
### T E S T I N G ###
@ -312,15 +319,15 @@ ENDIF (BUILD_TESTING)
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR}/tools toolsapplications)
INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR} toolsapplications)
INSTALL (
TARGETS
h5debug h5repart h5mkgrp
RUNTIME DESTINATION
${HDF5_INSTALL_BIN_DIR}/tools
${HDF5_INSTALL_BIN_DIR}
COMPONENT
toolsapplications
)