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/lib | |
| 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/lib')
| -rw-r--r-- | tools/lib/CMakeLists.txt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index 8c1cdb6..e65673a 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required (VERSION 2.8.11) PROJECT (HDF5_TOOLS_LIB) -option (ONLY_STATIC_TOOLS "Build Only Static Tools" OFF) #----------------------------------------------------------------------------- # Apply Definitions to compiler in this directory and below #----------------------------------------------------------------------------- @@ -37,8 +36,7 @@ set (H5_TOOLS_LIB_HDRS ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h ) -add_library (${HDF5_TOOLS_LIB_TARGET}_obj OBJECT ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) -add_library (${HDF5_TOOLS_LIB_TARGET} ${LIB_TYPE} $<TARGET_OBJECTS:${HDF5_TOOLS_LIB_TARGET}_obj>) +add_library (${HDF5_TOOLS_LIB_TARGET} ${LIB_TYPE} ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS}) TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} " " " ") target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}") @@ -53,15 +51,6 @@ set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES FOLDER libraries/tools INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) -if (ONLY_STATIC_TOOLS) - add_library (${HDF5_TOOLS_LIB_TARGET}_static STATIC $<TARGET_OBJECTS:${HDF5_TOOLS_LIB_TARGET}_obj>) - TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET}_static " " " ") - target_link_libraries (${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_LIB_TARGET}_static) - H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIB_TARGET}_static ${HDF5_TOOLS_LIB_NAME} STATIC) - set_target_properties (${HDF5_TOOLS_LIB_TARGET}_static PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" - ) -endif (ONLY_STATIC_TOOLS) ############################################################################## ############################################################################## |