diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-29 18:56:27 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-29 18:56:27 (GMT) |
| commit | 5c0a8cc86ebe85e1b46e20f253f09c86bdc83169 (patch) | |
| tree | 1281be3f8a32432ead139af7381426c0a9fe92d5 /src/CMakeLists.txt | |
| parent | 6f1dda474c22ee95b7cc132e703cd6a2ac596704 (diff) | |
| download | hdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.zip hdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.tar.gz hdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.tar.bz2 | |
[svn-r27912] Revert of r27887, which caused failures in the vds test. These
changes will be merged more carefully so we can more easily
identify any errors that arise.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) w/ gcc 4.9.2
serial and parallel (w/ MPICH 3.1.4)
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6253f51..ff69d5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -820,11 +820,6 @@ if (HDF5_GENERATE_HEADERS) endif (PERL_FOUND) endif (HDF5_GENERATE_HEADERS) -set (H5_PUBLIC_GENERATED_HEADERS - ${HDF5_SRC_DIR}/H5version.h - ${HDF5_SRC_DIR}/H5overflow.h -) - #----------------------------------------------------------------------------- # Setup the H5Detect utility which generates H5Tinit with platform # specific type checks inside @@ -837,7 +832,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5detect "${H5_PUBLIC_GENERATED_HEADERS}") + add_dependencies(H5detect "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5detect>) @@ -856,7 +851,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5make_libsettings "${H5_PUBLIC_GENERATED_HEADERS}") + add_dependencies(H5make_libsettings "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5make_libsettings>) @@ -905,7 +900,7 @@ endif (HDF5_ENABLE_DEBUG_APIS) set (install_targets ${HDF5_LIB_TARGET}) if (BUILD_SHARED_LIBS) - add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS}) + add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS}) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_LIBSH_TARGET} ${LINK_SHARED_LIBS}) if (NOT WIN32) @@ -950,7 +945,6 @@ if (NOT HDF5_INSTALL_NO_DEVELOPMENT) install ( FILES ${H5_PUBLIC_HEADERS} - ${H5_PUBLIC_GENERATED_HEADERS} DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT |