diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-27 01:39:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-27 01:39:06 (GMT) |
| commit | 6f1dda474c22ee95b7cc132e703cd6a2ac596704 (patch) | |
| tree | 84af5241f80a9c0a1e321a80508dc14a2b6ee711 /src/CMakeLists.txt | |
| parent | 574ff3980afe62f83660cb2c617154e85ab128fd (diff) | |
| parent | 8186a5cee10c41e97ba24b6fe1de9f6ce0c3902d (diff) | |
| download | hdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.zip hdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.tar.gz hdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.tar.bz2 | |
[svn-r27887] Description:
Merge changes from trunk to the branch.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff69d5e..6253f51 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -820,6 +820,11 @@ 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 @@ -832,7 +837,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5detect "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") + add_dependencies(H5detect "${H5_PUBLIC_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5detect>) @@ -851,7 +856,7 @@ endif (MSVC OR MINGW) if (HDF5_GENERATE_HEADERS) add_dependencies(H5detect generate_precompiled) else (HDF5_GENERATE_HEADERS) - add_dependencies(H5make_libsettings "${HDF5_SRC_DIR}/H5version.h;${HDF5_SRC_DIR}/H5overflow.h") + add_dependencies(H5make_libsettings "${H5_PUBLIC_GENERATED_HEADERS}") endif (HDF5_GENERATE_HEADERS) set (CMD $<TARGET_FILE:H5make_libsettings>) @@ -900,7 +905,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}) + add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS}) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_LIBSH_TARGET} ${LINK_SHARED_LIBS}) if (NOT WIN32) @@ -945,6 +950,7 @@ if (NOT HDF5_INSTALL_NO_DEVELOPMENT) install ( FILES ${H5_PUBLIC_HEADERS} + ${H5_PUBLIC_GENERATED_HEADERS} DESTINATION ${HDF5_INSTALL_INCLUDE_DIR} COMPONENT |