Skip to content

Commit

Permalink
Do not publish compression headers or docs (#3865)
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Nov 21, 2023
1 parent ed31aac commit cf2f95e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 99 deletions.
2 changes: 0 additions & 2 deletions CMakeInstallation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ The HDF5 data model, file format, API, library, and tools are open and distribut
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;ALL;/")
else ()
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;libraries;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;headers;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};HDF5_ZLIB;configinstall;/")
endif ()
endif ()
Expand All @@ -517,7 +516,6 @@ The HDF5 data model, file format, API, library, and tools are open and distribut
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;ALL;/")
else ()
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;headers;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;configinstall;/")
endif ()
endif ()
Expand Down
51 changes: 2 additions & 49 deletions config/cmake/LIBAEC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ target_link_libraries (${LIBAEC_LIB_TARGET} PRIVATE ${LINK_LIBS})
H5_SET_LIB_OPTIONS (${LIBAEC_LIB_TARGET} ${LIBAEC_LIB_NAME} STATIC 0)
set_target_properties (${LIBAEC_LIB_TARGET} PROPERTIES
VERSION 0.0.12 SOVERSION 0
PUBLIC_HEADER "${LIBAEC_PUBLIC_HEADERS}"
PUBLIC_HEADER ""
LINKER_LANGUAGE C
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
Expand All @@ -194,7 +194,7 @@ target_link_libraries (${SZIP_LIB_TARGET} PRIVATE ${LIBAEC_LIB_TARGET})
H5_SET_LIB_OPTIONS (${SZIP_LIB_TARGET} ${SZIP_LIB_NAME} STATIC 0)
set_target_properties (${SZIP_LIB_TARGET} PROPERTIES
VERSION 2.0.1 SOVERSION 2
PUBLIC_HEADER "${SZIP_PUBLIC_HEADERS}"
PUBLIC_HEADER ""
LINKER_LANGUAGE C
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
Expand Down Expand Up @@ -234,17 +234,6 @@ if (WIN32)
find_program (WIX_EXECUTABLE candle PATHS "${CPACK_WIX_ROOT}/bin")
endif ()

#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
#if (NOT LIBAEC_INSTALL_NO_DEVELOPMENT)
# install (
# FILES ${PROJECT_BINARY_DIR}/aec_config.h
# DESTINATION ${LIBAEC_INSTALL_INCLUDE_DIR}
# COMPONENT headers
# )
#endif ()

#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -333,20 +322,6 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED)
)
endif ()

#-----------------------------------------------------------------------------
# Add Document File(s) to CMake Install
#-----------------------------------------------------------------------------
if (NOT LIBAEC_EXTERNALLY_CONFIGURED)
install (
FILES
${LIBAEC_SOURCE_DIR}/README.md
${LIBAEC_SOURCE_DIR}/INSTALL.md
${LIBAEC_SOURCE_DIR}/CHANGELOG.md
DESTINATION ${LIBAEC_INSTALL_DATA_DIR}
COMPONENT documents
)
endif ()

#-----------------------------------------------------------------------------
# Check for Installation Utilities
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -464,7 +439,6 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED)
include (InstallRequiredSystemLibraries)

set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;libraries;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;headers;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${LIBAEC_BINARY_DIR};LIBAEC;configinstall;/")

set (CPACK_ALL_INSTALL_TYPES Full Developer User)
Expand All @@ -476,33 +450,12 @@ if (NOT LIBAEC_EXTERNALLY_CONFIGURED)

cpack_add_component_group(Runtime)

cpack_add_component_group(Documents
EXPANDED
DESCRIPTION "Release notes for libaec"
)

cpack_add_component_group(Development
EXPANDED
DESCRIPTION "All of the tools you'll need to develop applications"
)

cpack_add_component (libraries
DISPLAY_NAME "LIBAEC Libraries"
REQUIRED
GROUP Runtime
INSTALL_TYPES Full Developer User
)
cpack_add_component (headers
DISPLAY_NAME "LIBAEC Headers"
DEPENDS libraries
GROUP Development
INSTALL_TYPES Full Developer
)
cpack_add_component (documents
DISPLAY_NAME "LIBAEC Documents"
GROUP Documents
INSTALL_TYPES Full Developer
)
cpack_add_component (configinstall
DISPLAY_NAME "LIBAEC CMake files"
DEPENDS libraries
Expand Down
49 changes: 1 addition & 48 deletions config/cmake/ZLIB/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ TARGET_C_PROPERTIES (${ZLIB_LIB_TARGET} STATIC)
target_link_libraries (${ZLIB_LIB_TARGET} PRIVATE ${LINK_LIBS})
H5_SET_LIB_OPTIONS (${ZLIB_LIB_TARGET} ${ZLIB_LIB_NAME} STATIC 0)
set_target_properties(${ZLIB_LIB_TARGET} PROPERTIES
PUBLIC_HEADER "${ZLIB_PUBLIC_HEADERS}"
PUBLIC_HEADER ""
LINKER_LANGUAGE C
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
Expand Down Expand Up @@ -287,17 +287,6 @@ if (WIN32)
find_program (WIX_EXECUTABLE candle PATHS "${CPACK_WIX_ROOT}/bin")
endif ()

#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
if (NOT ZLIB_INSTALL_NO_DEVELOPMENT)
install (
FILES ${PROJECT_BINARY_DIR}/zconf.h
DESTINATION ${ZLIB_INSTALL_INCLUDE_DIR}
COMPONENT headers
)
endif ()

#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -386,20 +375,6 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED)
)
endif ()

#-----------------------------------------------------------------------------
# Add Document File(s) to CMake Install
#-----------------------------------------------------------------------------
if (NOT ZLIB_EXTERNALLY_CONFIGURED)
install (
FILES
${ZLIB_SOURCE_DIR}/FAQ
${ZLIB_SOURCE_DIR}/README
${ZLIB_SOURCE_DIR}/INDEX
DESTINATION ${ZLIB_INSTALL_DATA_DIR}
COMPONENT documents
)
endif ()

#-----------------------------------------------------------------------------
# Check for Installation Utilities
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -523,7 +498,6 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED)
include (InstallRequiredSystemLibraries)

set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;libraries;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;headers;/")
set (CPACK_INSTALL_CMAKE_PROJECTS "${ZLIB_BINARY_DIR};ZLIB;configinstall;/")

set (CPACK_ALL_INSTALL_TYPES Full Developer User)
Expand All @@ -535,33 +509,12 @@ if (NOT ZLIB_EXTERNALLY_CONFIGURED)

cpack_add_component_group(Runtime)

cpack_add_component_group(Documents
EXPANDED
DESCRIPTION "Release notes for zlib"
)

cpack_add_component_group(Development
EXPANDED
DESCRIPTION "All of the tools you'll need to develop applications"
)

cpack_add_component (libraries
DISPLAY_NAME "ZLIB Libraries"
REQUIRED
GROUP Runtime
INSTALL_TYPES Full Developer User
)
cpack_add_component (headers
DISPLAY_NAME "ZLIB Headers"
DEPENDS libraries
GROUP Development
INSTALL_TYPES Full Developer
)
cpack_add_component (documents
DISPLAY_NAME "ZLIB Documents"
GROUP Documents
INSTALL_TYPES Full Developer
)
cpack_add_component (configinstall
DISPLAY_NAME "ZLIB CMake files"
DEPENDS libraries
Expand Down

0 comments on commit cf2f95e

Please sign in to comment.