summaryrefslogtreecommitdiffstats
path: root/tools/h5diff
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-07-15 20:33:50 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-07-15 20:33:50 (GMT)
commit5065c139c78c1ff9d8c21f98a46d969a31f254be (patch)
tree5e7550e1139058e9968db63857274fde457a0e37 /tools/h5diff
parent1ed71c503796eea0e746726f041e2b5b4e181bf2 (diff)
parent12b86abf18d831a2eeb337146187e220a50fafb2 (diff)
downloadhdf5-5065c139c78c1ff9d8c21f98a46d969a31f254be.zip
hdf5-5065c139c78c1ff9d8c21f98a46d969a31f254be.tar.gz
hdf5-5065c139c78c1ff9d8c21f98a46d969a31f254be.tar.bz2
[svn-r27397] Merge revisions 27255 through 27393 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'tools/h5diff')
-rw-r--r--tools/h5diff/CMakeLists.txt14
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 39095a5..0a5c813 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -41,12 +41,12 @@ if (BUILD_TESTING)
TARGET_C_PROPERTIES (h5diffgentest STATIC " " " ")
target_link_libraries (h5diffgentest ${HDF5_LIB_TARGET})
set_target_properties (h5diffgentest PROPERTIES FOLDER generator/tools)
-
+
#add_test (NAME h5diffgentest COMMAND $<TARGET_FILE:h5diffgentest>)
endif (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
include (CMakeTests.cmake)
-
+
endif (BUILD_TESTING)
##############################################################################
@@ -64,10 +64,7 @@ endif (BUILD_TESTING)
install (
TARGETS
h5diff
- RUNTIME DESTINATION
- ${HDF5_INSTALL_BIN_DIR}
- COMPONENT
- toolsapplications
+ RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
)
if (H5_HAVE_PARALLEL)
@@ -77,9 +74,6 @@ if (H5_HAVE_PARALLEL)
install (
TARGETS
ph5diff
- RUNTIME DESTINATION
- ${HDF5_INSTALL_BIN_DIR}
- COMPONENT
- toolsapplications
+ RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
)
endif (H5_HAVE_PARALLEL)