diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2013-06-14 14:24:27 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2013-06-14 14:24:27 (GMT) |
commit | e41f1a44b8790d39e65396e5b8d739026cf20488 (patch) | |
tree | d62ff63b6f3e4b7c7d84e153d8a09863f6977910 /src | |
parent | 109aa3016b1a9a4c8a7244319ec9ee8af078ea8d (diff) | |
download | hdf5-e41f1a44b8790d39e65396e5b8d739026cf20488.zip hdf5-e41f1a44b8790d39e65396e5b8d739026cf20488.tar.gz hdf5-e41f1a44b8790d39e65396e5b8d739026cf20488.tar.bz2 |
[svn-r23771] HDFFV-8434,-8437,-8445,-8447,-8461: Merge changes from Trunk.
Tested: local linux
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c2ce3f9..64d5e87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -614,6 +614,7 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}) # specific type checks inside #----------------------------------------------------------------------------- ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c) +TARGET_C_PROPERTIES (H5detect " " " ") IF (MSVC) TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib") ENDIF (MSVC) @@ -627,6 +628,7 @@ ADD_CUSTOM_COMMAND ( ) ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) +TARGET_C_PROPERTIES (H5make_libsettings " " " ") IF (MSVC) TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib") ENDIF (MSVC) @@ -676,6 +678,7 @@ 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} ${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) TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} dl) |