diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-06-11 16:12:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-06-11 16:12:49 (GMT) |
| commit | d8572191812a3debcb172fe72f3ecc5b87e59eb3 (patch) | |
| tree | 0ef2a9cdee70c7d903080af175f518b6063f4db8 /src | |
| parent | ba0ea5dc9c8095f6097491ee63b27eeb6da40ebb (diff) | |
| download | hdf5-d8572191812a3debcb172fe72f3ecc5b87e59eb3.zip hdf5-d8572191812a3debcb172fe72f3ecc5b87e59eb3.tar.gz hdf5-d8572191812a3debcb172fe72f3ecc5b87e59eb3.tar.bz2 | |
[svn-r22451] Brought cmake configuration / configure changes from Trunk.
Tested jam, local linux
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/H5config.h.in | 4 | ||||
| -rw-r--r-- | src/H5private.h | 2 | ||||
| -rw-r--r-- | src/H5system.c | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 263f6b8..ae99dc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -652,6 +652,9 @@ ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT) # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- IF (HDF5_EXPORTED_TARGETS) + + INSTALL_TARGET_PDB (${HDF5_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} libraries) + INSTALL ( TARGETS ${HDF5_LIB_TARGET} diff --git a/src/H5config.h.in b/src/H5config.h.in index 5603476..1dbb545 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -409,8 +409,8 @@ /* Define if your system has window style path name. */ #undef HAVE_WINDOW_PATH -/* Define to 1 if you have the <winsock.h> header file. */ -#undef HAVE_WINSOCK_H +/* Define to 1 if you have the <winsock2.h> header file. */ +#undef HAVE_WINSOCK2_H /* Define to 1 if you have the <zlib.h> header file. */ #undef HAVE_ZLIB_H diff --git a/src/H5private.h b/src/H5private.h index c32d4f5..ef6c9d8 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -155,7 +155,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NOGDI /* Exclude Graphic Display Interface macros */ -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H #include <winsock2.h> #endif diff --git a/src/H5system.c b/src/H5system.c index bb1d2f1..c0baee1 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -639,7 +639,7 @@ Wgettimeofday(struct timeval *tv, struct timezone *tz) return 0; } -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H #pragma comment(lib, "advapi32.lib") #endif @@ -650,12 +650,12 @@ char* Wgetlogin() { -#ifdef H5_HAVE_WINSOCK_H +#ifdef H5_HAVE_WINSOCK2_H long bufferCount = WloginBuffer_count; if (GetUserName(Wlogin_buffer, &bufferCount) == 0) return (Wlogin_buffer); else -#endif /* H5_HAVE_WINSOCK_H */ +#endif /* H5_HAVE_WINSOCK2_H */ return NULL; } |