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 /src | |
| 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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fd02ef7..d5d57d4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -858,8 +858,7 @@ set_source_files_properties (${HDF5_BINARY_DIR}/H5version.h GENERATED) set (common_SRCS ${common_SRCS} ${HDF5_BINARY_DIR}/H5overflow.h) set_source_files_properties (${HDF5_BINARY_DIR}/H5overflow.h GENERATED) -add_library (${HDF5_LIB_TARGET}_obj OBJECT ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS}) -add_library (${HDF5_LIB_TARGET} ${LIB_TYPE} $<TARGET_OBJECTS:${HDF5_LIB_TARGET}_obj>) +add_library (${HDF5_LIB_TARGET} ${LIB_TYPE} ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS}) TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} " " " ") target_link_libraries (${HDF5_LIB_TARGET} ${LINK_LIBS}) if (NOT WIN32) @@ -874,21 +873,6 @@ set_target_properties (${HDF5_LIB_TARGET} PROPERTIES FOLDER libraries INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) -if (ONLY_STATIC_TOOLS) - add_library (${HDF5_LIB_TARGET}_static STATIC $<TARGET_OBJECTS:${HDF5_LIB_TARGET}_obj>) - TARGET_C_PROPERTIES (${HDF5_LIB_TARGET}_static " " " ") - target_link_libraries (${HDF5_LIB_TARGET}_static ${LINK_LIBS}) - if (NOT WIN32) - target_link_libraries (${HDF5_LIB_TARGET}_static dl) - endif (NOT WIN32) - if (H5_HAVE_PARALLEL AND MPI_C_FOUND) - target_link_libraries (${HDF5_LIB_TARGET}_static ${MPI_C_LIBRARIES}) - endif (H5_HAVE_PARALLEL AND MPI_C_FOUND) - H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET}_static ${HDF5_LIB_NAME} STATIC) - set_target_properties (${HDF5_LIB_TARGET}_static PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" - ) -endif (ONLY_STATIC_TOOLS) option (HDF5_ENABLE_DEBUG_APIS "Turn on debugging in all packages" OFF) if (HDF5_ENABLE_DEBUG_APIS) |