diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-09-03 17:12:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-09-03 17:12:52 (GMT) |
| commit | c23f3a7ea577b66f103ab06e9310e819c13f5401 (patch) | |
| tree | 5fd6bbaf00a3973ea0d0e591d9b6256b687c91a2 /tools/h5diff | |
| parent | 2154d1c6f1b791a2ba9125a48a098fd4da42f01f (diff) | |
| download | hdf5-c23f3a7ea577b66f103ab06e9310e819c13f5401.zip hdf5-c23f3a7ea577b66f103ab06e9310e819c13f5401.tar.gz hdf5-c23f3a7ea577b66f103ab06e9310e819c13f5401.tar.bz2 | |
[svn-r25569] Added option to build tools static when building shared libraries. This will prevent 'dll' being appended to the tool name on windows. See HDFFV-8292.
Tested: local linux
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/CMakeLists.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 35c55a4..4e38fe1 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -13,10 +13,15 @@ add_executable (h5diff ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_common.c ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_main.c ) -TARGET_NAMING (h5diff ${LIB_TYPE}) TARGET_C_PROPERTIES (h5diff " " " ") -target_link_libraries (h5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5diff PROPERTIES FOLDER tools) +if (ONLY_STATIC_TOOLS) + TARGET_NAMING (h5diff STATIC) + target_link_libraries (h5diff ${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) +else (ONLY_STATIC_TOOLS) + TARGET_NAMING (h5diff ${LIB_TYPE}) + target_link_libraries (h5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) +endif (ONLY_STATIC_TOOLS) set (H5_DEP_EXECUTABLES h5diff) @@ -25,10 +30,15 @@ if (H5_HAVE_PARALLEL) ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_common.c ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/ph5diff_main.c ) - TARGET_NAMING (ph5diff ${LIB_TYPE}) TARGET_C_PROPERTIES (ph5diff " " " ") - target_link_libraries (ph5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (ph5diff PROPERTIES FOLDER tools) + if (ONLY_STATIC_TOOLS) + TARGET_NAMING (ph5diff STATIC) + target_link_libraries (ph5diff ${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) + else (ONLY_STATIC_TOOLS) + TARGET_NAMING (ph5diff ${LIB_TYPE}) + target_link_libraries (ph5diff ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) + endif (ONLY_STATIC_TOOLS) endif (H5_HAVE_PARALLEL) if (BUILD_TESTING) |