From cf2f95e1b47bc3274859e8b23f10894f1431e4a9 Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:00:35 -0600 Subject: [PATCH] Do not publish compression headers or docs (#3865) --- CMakeInstallation.cmake | 2 -- config/cmake/LIBAEC/CMakeLists.txt | 51 ++---------------------------- config/cmake/ZLIB/CMakeLists.txt | 49 +--------------------------- 3 files changed, 3 insertions(+), 99 deletions(-) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 02f8dc35058..71287402f07 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -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 () @@ -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 () diff --git a/config/cmake/LIBAEC/CMakeLists.txt b/config/cmake/LIBAEC/CMakeLists.txt index 9ffb68d28b7..a8195872899 100644 --- a/config/cmake/LIBAEC/CMakeLists.txt +++ b/config/cmake/LIBAEC/CMakeLists.txt @@ -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 "$/include>" ) @@ -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 "$/include>" ) @@ -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 #----------------------------------------------------------------------------- @@ -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 #----------------------------------------------------------------------------- @@ -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) @@ -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 diff --git a/config/cmake/ZLIB/CMakeLists.txt b/config/cmake/ZLIB/CMakeLists.txt index 5c06a544ce2..d4b39248140 100644 --- a/config/cmake/ZLIB/CMakeLists.txt +++ b/config/cmake/ZLIB/CMakeLists.txt @@ -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 "$/include>" ) @@ -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 #----------------------------------------------------------------------------- @@ -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 #----------------------------------------------------------------------------- @@ -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) @@ -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