diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-09-03 19:04:18 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-09-03 19:04:18 (GMT) |
| commit | 5a4357e4fb0b920c46cae32e446a662dd44ed7f9 (patch) | |
| tree | 32b62e2f670ca1565689c28ade8f1bdbdb72ee6c /tools/misc | |
| parent | c23f3a7ea577b66f103ab06e9310e819c13f5401 (diff) | |
| download | hdf5-5a4357e4fb0b920c46cae32e446a662dd44ed7f9.zip hdf5-5a4357e4fb0b920c46cae32e446a662dd44ed7f9.tar.gz hdf5-5a4357e4fb0b920c46cae32e446a662dd44ed7f9.tar.bz2 | |
[svn-r25570] UNDO: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.
Windows DLL linkage problem because of defines needed.
Tested: local linux
Diffstat (limited to 'tools/misc')
| -rw-r--r-- | tools/misc/CMakeLists.txt | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 3b08e1b..8af05b4 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -11,37 +11,22 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib) # -------------------------------------------------------------------- #-- Misc Executables add_executable (h5debug ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5debug.c) +TARGET_NAMING (h5debug ${LIB_TYPE}) TARGET_C_PROPERTIES (h5debug " " " ") +target_link_libraries (h5debug ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) set_target_properties (h5debug PROPERTIES FOLDER tools) -if (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5debug STATIC) - target_link_libraries (h5debug ${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) -else (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5debug ${LIB_TYPE}) - target_link_libraries (h5debug ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) -endif (ONLY_STATIC_TOOLS) add_executable (h5repart ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5repart.c) +TARGET_NAMING (h5repart ${LIB_TYPE}) TARGET_C_PROPERTIES (h5repart " " " ") +target_link_libraries (h5repart ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) set_target_properties (h5repart PROPERTIES FOLDER tools) -if (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5repart STATIC) - target_link_libraries (h5repart ${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) -else (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5repart ${LIB_TYPE}) - target_link_libraries (h5repart ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) -endif (ONLY_STATIC_TOOLS) add_executable (h5mkgrp ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5mkgrp.c) +TARGET_NAMING (h5mkgrp ${LIB_TYPE}) TARGET_C_PROPERTIES (h5mkgrp " " " ") +target_link_libraries (h5mkgrp ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5mkgrp PROPERTIES FOLDER tools) -if (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5mkgrp STATIC) - target_link_libraries (h5mkgrp ${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) -else (ONLY_STATIC_TOOLS) - TARGET_NAMING (h5mkgrp ${LIB_TYPE}) - target_link_libraries (h5mkgrp ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) -endif (ONLY_STATIC_TOOLS) set (H5_DEP_EXECUTABLES h5debug |