summaryrefslogtreecommitdiffstats
path: root/hl/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-10-27 03:44:29 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-10-27 03:44:29 (GMT)
commit62b92ddf4096d9b8f6235587ec16f34f6c6fa119 (patch)
tree651bb6dbb8c4fe6bec2c442618f7ce60593c6404 /hl/src
parent8a12b57483854929dd9ccbcf107dd1051c6c3a12 (diff)
downloadhdf5-62b92ddf4096d9b8f6235587ec16f34f6c6fa119.zip
hdf5-62b92ddf4096d9b8f6235587ec16f34f6c6fa119.tar.gz
hdf5-62b92ddf4096d9b8f6235587ec16f34f6c6fa119.tar.bz2
Makes the installed header files the same between the autotools
and CMake. * CMake will no longer install private generated headers and tools library headers. * Several empty public header files (which represent internal packages) were removed. These were only installed by CMake. * Autotools installs will install H5FDwindows.h. Fixes HDFFV-10614.
Diffstat (limited to 'hl/src')
-rw-r--r--hl/src/CMakeLists.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index e339f11..bf0f6ff 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -21,7 +21,6 @@ set (HL_HEADERS
${HDF5_HL_SRC_SOURCE_DIR}/H5DOpublic.h
${HDF5_HL_SRC_SOURCE_DIR}/H5DSpublic.h
${HDF5_HL_SRC_SOURCE_DIR}/H5IMpublic.h
- ${HDF5_HL_SRC_SOURCE_DIR}/H5LTparse.h
${HDF5_HL_SRC_SOURCE_DIR}/H5LTpublic.h
${HDF5_HL_SRC_SOURCE_DIR}/H5PTpublic.h
${HDF5_HL_SRC_SOURCE_DIR}/H5TBpublic.h
@@ -29,7 +28,11 @@ set (HL_HEADERS
${HDF5_HL_SRC_SOURCE_DIR}/hdf5_hl.h
)
-add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS})
+set (HL_PRIVATE_HEADERS
+ ${HDF5_HL_SRC_SOURCE_DIR}/H5LTparse.h
+)
+
+add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS} ${HL_PRIVATE_HEADERS})
target_include_directories(${HDF5_HL_LIB_TARGET}
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
@@ -42,7 +45,7 @@ set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF
set (install_targets ${HDF5_HL_LIB_TARGET})
if (BUILD_SHARED_LIBS)
- add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS})
+ add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS} ${HL_PRIVATE_HEADERS})
target_include_directories(${HDF5_HL_LIBSH_TARGET}
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"