From c0f50dec5334f54cf060b1f9c4250c72649b4ff2 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 14 Dec 2020 13:19:52 +0100 Subject: [PATCH] cpack --- .github/workflows/cmake-build-ci.gen | 5 +++ .github/workflows/cmake-build-ci.yml | 17 ++++++++++ CMake/InstallPublicHeaders.cmake | 1 + CMake/_Include.cmake | 1 - CMakeConfig.txt | 2 ++ CMakeLists.txt | 21 +++++++++++- CPack.txt | 45 ++++++++++++++++++++----- CPackDEB.txt | 15 +++------ CPackFreeBSD.txt | 2 ++ CPackRPM.txt | 6 ++++ ChangeLog-1.1.md | 3 +- contrib/bin/memaslap/CMakeLists.txt | 1 + docs/CMakeLists.txt | 23 +++++++++++-- docs/source/ChangeLog-1.1.rst | 23 +++++++------ src/bin/CMakeLists.txt | 1 + src/libhashkit/CMakeLists.txt | 9 +++-- src/libmemcached/CMakeLists.txt | 9 +++-- src/libmemcachedprotocol/CMakeLists.txt | 9 +++-- src/libmemcachedutil/CMakeLists.txt | 9 +++-- support/CMakeLists.txt | 4 +++ 20 files changed, 165 insertions(+), 41 deletions(-) create mode 100644 CPackFreeBSD.txt diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 1c758836..3101dc78 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -183,6 +183,9 @@ function steps_build() { run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -332,6 +335,8 @@ jobs: run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} - name: Install run: cmake --install build --prefix installed --config ${{ env.CMAKE_BUILD_TYPE }} + - name: Package + run: cmake -E chdir build cpack # release builds release: diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index 1b45af18..2e4009d5 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -97,6 +97,9 @@ jobs: run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -174,6 +177,9 @@ jobs: run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -250,6 +256,9 @@ jobs: run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -327,6 +336,9 @@ jobs: run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -368,6 +380,8 @@ jobs: run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} - name: Install run: cmake --install build --prefix installed --config ${{ env.CMAKE_BUILD_TYPE }} + - name: Package + run: cmake -E chdir build cpack # release builds release: @@ -500,6 +514,9 @@ jobs: run: make -C build -j2 test - name: Install run: make -C build -j2 install DESTDIR=/tmp + - name: Package + if: ${{ env.CMAKE_BUILD_TYPE == 'Release' && env.CC_VER == 'cur' }} + run: make -C build package - name: Failed tests log if: ${{ failure() }} run: cat build/Testing/Temporary/LastTest.log || true diff --git a/CMake/InstallPublicHeaders.cmake b/CMake/InstallPublicHeaders.cmake index 2c628158..05629d67 100644 --- a/CMake/InstallPublicHeaders.cmake +++ b/CMake/InstallPublicHeaders.cmake @@ -37,6 +37,7 @@ function(install_public_headers DIRECTORY) set(HEADER "${CMAKE_CURRENT_BINARY_DIR}/${HEADER}") endif() install(FILES ${HEADER} + COMPONENT dev DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${DIRECTORY} ) endforeach() diff --git a/CMake/_Include.cmake b/CMake/_Include.cmake index c75c741f..39442dc2 100644 --- a/CMake/_Include.cmake +++ b/CMake/_Include.cmake @@ -6,7 +6,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) endif() include(CMakePushCheckState) -include(GNUInstallDirs) include(CMakePackageConfigHelpers) macro(make_have_identifier NAME ID) diff --git a/CMakeConfig.txt b/CMakeConfig.txt index b8c60a76..377c03ad 100644 --- a/CMakeConfig.txt +++ b/CMakeConfig.txt @@ -82,6 +82,8 @@ endif() # modules +include(GNUInstallDirs) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") if(NOT BUILD_DOCSONLY) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57509844..7dc13f11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,9 +50,28 @@ if(NOT BUILD_DOCSONLY) # keep last configure_file(${CONFIGURE_FILE_IN} ${CONFIGURE_FILE_OUT} @ONLY) - include(CPack.txt) endif() +include(CPack.txt) + +install(FILES + AUTHORS + BUGS.md + ChangeLog + ChangeLog-0.md + ChangeLog-1.0.md + ChangeLog-1.1.md + ChangeLog.md + CONTRIBUTING.md + COPYING + LICENSE + NEWS + README.md + TODO + COMPONENT doc + DESTINATION ${CMAKE_INSTALL_DOCDIR}/ + ) + if(ENV{INVALID_CONFIGURATION}) message(FATAL_ERROR "invalid configuration -- giving up") endif() diff --git a/CPack.txt b/CPack.txt index c3973292..97221b62 100644 --- a/CPack.txt +++ b/CPack.txt @@ -30,11 +30,48 @@ set(CPACK_SOURCE_TXZ 0) set(CPACK_SOURCE_TZ 0) set(CPACK_SOURCE_ZIP ${WIN32}) +# project internals +set(CPACK_PACKAGE_LICENSE "BSD-3-Clause") +set(CPACK_PACKAGE_CONTACT "${PROJECT_CONTACT}") +set(CPACK_PACKAGE_VENDOR "${PROJECT_CONTACT}") +set(CPACK_PACKAGE_DESCRIPTION + "libmemcached is an open source C/C++ client library and tools for the +memcached server (http://memcached.org/). It has been designed to be +light on memory usage, thread safe, and provide full access to server +side methods.") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}") +#set(CPACK_PACKAGE_CHECKSUM SHA1) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") +set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") +set(CPACK_CHANGELOG_FILE "${CMAKE_SOURCE_DIR}/ChangeLog-1.1.md") + +set(CPACK_SOURCE_IGNORE_FILES "/[.]git/;/[.](idea|settings|c?project);~$;[.]log$;[.]bak$") + +set(CPACK_PACKAGE_FILE_NAME + "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") + +set(CPACK_ARCHIVE_COMPONENT_INSTALL ${CPACK_COMPONENT_INSTALL}) + +# dependencies +if(HAVE_LIBSASL) + string(APPEND CPACK_PACKAGE_DEPENDS " libsasl2") +endif() +if(HAVE_TBB) + string(APPEND CPACK_PACKAGE_DEPENDS " tbb") +endif() +if(HAVE_LIBEVENT) + string(APPEND CPACK_PACKAGE_DEPENDS " libevent") +endif() + + # DEBs if(EXISTS /usr/bin/dpkg) cpack_include_if(DEB) endif() +if(APPLE) +endif() + # BSDs if(CMAKE_SYSTEM_NAME MATCHES BSD) cpack_include_if(BSD) @@ -45,13 +82,5 @@ if(EXISTS /usr/bin/dnf OR EXISTS /usr/bin/yum OR EXISTS /usr/bin/rpmbuild) cpack_include_if(RPM) endif() -# project internals -set(CPACK_PACKAGE_VENDOR ${CMAKE_PROJECT_HOMEPAGE_URL}) -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}") -set(CPACK_PACKAGE_CHECKSUM SHA1) -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") -set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") - # keep last include(CPack) diff --git a/CPackDEB.txt b/CPackDEB.txt index 85668a1c..ea19c9b6 100644 --- a/CPackDEB.txt +++ b/CPackDEB.txt @@ -1,11 +1,6 @@ set(CPACK_BINARY_DEB ON) -set(CPACK_PACKAGE_CONTACT "${PROJECT_CONTACT}") -if(HAVE_LIBSASL) - string(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS " libsasl2") -endif() -if(HAVE_TBB) - string(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS " tbb") -endif() -if(HAVE_LIBEVENT) - string(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS " libevent") -endif() +set(CPACK_DEB_COMPONENT_INSTALL ${CPACK_COMPONENT_INSTALL}) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_PACKAGE_DEPENDS}") +set(CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS ON) +set(CPACK_COMPONENT_bin_DEPENDS lib) +set(CPACK_COMPONENT_dev_DEPENDS lib) diff --git a/CPackFreeBSD.txt b/CPackFreeBSD.txt new file mode 100644 index 00000000..88106d5f --- /dev/null +++ b/CPackFreeBSD.txt @@ -0,0 +1,2 @@ +set(CPACK_BINARY_FREEBSD ON) +set(CPACK_FREEBSD_PACKAGE_LICENSE "${CPACK_PACKAGE_LICENSE}") diff --git a/CPackRPM.txt b/CPackRPM.txt index 9c092cfd..acde6282 100644 --- a/CPackRPM.txt +++ b/CPackRPM.txt @@ -1 +1,7 @@ set(CPACK_BINARY_RPM ON) +set(CPACK_RPM_COMPONENT_INSTALL ${CPACK_COMPONENT_INSTALL}) +set(CPACK_RPM_PACKAGE_DEPENDS "${CPACK_PACKAGE_DEPENDS}") +set(CPACK_RPM_PACKAGE_LICENSE "${CPACK_PACKAGE_LICENSE}") +set(CPACK_RPM_CHANGELOG_FILE "${CPACK_CHANGELOG_FILE}") +set(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}") +set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries") diff --git a/ChangeLog-1.1.md b/ChangeLog-1.1.md index 2d5846a7..e464cab8 100644 --- a/ChangeLog-1.1.md +++ b/ChangeLog-1.1.md @@ -2,6 +2,8 @@ ## v 1.1.0 +> released YYYY-MM-DD + **NOTE:** This is a bug fix release, not a feature release. The minor version number was incremented due to the following changes: @@ -18,7 +20,6 @@ was incremented due to the following changes: * Travis: https://travis-ci.org/m6w6/libmemcached (Linux **·** arm64, ppc64le, s390x) * Sourcehut: https://builds.sr.ht/~m6w6/libmemcached (FreeBSD, OpenBSD **·** amd64) -> released YYYY-MM-DD * Fix build failure due to comparison of incompatible types in bin/memflush and bin/memstat. * Fix wrong type of memcached_instance_st::server_timeout_counter_query_id from uint32_t to uint64_t. diff --git a/contrib/bin/memaslap/CMakeLists.txt b/contrib/bin/memaslap/CMakeLists.txt index abd3c83d..3d8d9699 100644 --- a/contrib/bin/memaslap/CMakeLists.txt +++ b/contrib/bin/memaslap/CMakeLists.txt @@ -31,6 +31,7 @@ if(ENABLE_MEMASLAP AND CMAKE_USE_PTHREADS_INIT) INSTALL_RPATH ${CMAKE_INSTALL_RPATH}/../${CMAKE_INSTALL_LIBDIR}) endif() install(TARGETS memaslap + COMPONENT bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index dd6a32c5..1240f31e 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -32,8 +32,13 @@ else() configure_file("conf.py.in" "conf.py" @ONLY) add_subdirectory(source) + file(GLOB_RECURSE DOCS_SOURCE + CONFIGURE_DEPENDS + "*.rst") + if(BUILD_DOCS_HTML) - add_custom_target(html + add_custom_command( + OUTPUT "${SPHINX_HTML_DIR}" COMMAND ${SPHINX_EXECUTABLE} -q -b html @@ -42,12 +47,21 @@ else() ${SPHINX_OPTIONS} "${SPHINX_SOURCE_DIR}" "${SPHINX_HTML_DIR}" + COMMAND ${CMAKE_COMMAND} -E touch html BYPRODUCTS ${SPHINX_HTML_DIR} + DEPENDS "${DOCS_SOURCE}" ) + add_custom_target(html ALL DEPENDS "${SPHINX_HTML_DIR}") + + install(DIRECTORY ${SPHINX_HTML_DIR}/ + COMPONENT doc + DESTINATION ${CMAKE_INSTALL_DOCDIR}/html) endif() if(BUILD_DOCS_MAN) - add_custom_target(man ALL + add_custom_command( + OUTPUT ${SPHINX_MAN_DIR} + COMMAND ${SPHINX_EXECUTABLE} -q -b man -c "${SPHINX_BUILD_DIR}" @@ -55,8 +69,11 @@ else() ${SPHINX_OPTIONS} "${SPHINX_SOURCE_DIR}" "${SPHINX_MAN_DIR}" + COMMAND ${CMAKE_COMMAND} -E touch man BYPRODUCTS ${SPHINX_MAN_DIR} + DEPENDS "${DOCS_SOURCE}" ) + add_custom_target(man ALL DEPENDS "${SPHINX_MAN_DIR}") set(MAN_EXT "") if(BUILD_DOCS_MANGZ) @@ -76,10 +93,12 @@ else() endif() install(DIRECTORY ${SPHINX_MAN_DIR}/ + COMPONENT doc DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 FILES_MATCHING PATTERN *.1${MAN_EXT} ) install(DIRECTORY ${SPHINX_MAN_DIR}/ + COMPONENT doc DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 FILES_MATCHING PATTERN *.3${MAN_EXT} ) diff --git a/docs/source/ChangeLog-1.1.rst b/docs/source/ChangeLog-1.1.rst index 282aff20..42de1de6 100644 --- a/docs/source/ChangeLog-1.1.rst +++ b/docs/source/ChangeLog-1.1.rst @@ -8,7 +8,12 @@ ChangeLog v1.1 v 1.1.0 ------- -**NOTE:**\ :raw-html-m2r:`
` +.. + + released YYYY-MM-DD + + +**NOTE:** This is a bug fix release, not a feature release. The minor version number was incremented due to the following changes: @@ -17,7 +22,7 @@ was incremented due to the following changes: * Ported test suite to Catch2. * Build requires C++11 compiler support. * Tests require C++17 compiler support. -* Moved the project from launchpad to github: +* Moved the project from launchpad to github: * Source: https://github.com/m6w6/libmemcached * Documentation: https://m6w6.github.io/libmemcached @@ -25,12 +30,7 @@ was incremented due to the following changes: * Github: https://github.com/m6w6/libmemcached/actions (Linux, MacOS **·** amd64) * Travis: https://travis-ci.org/m6w6/libmemcached (Linux **·** arm64, ppc64le, s390x) - * Cirrus: https://cirrus-ci.com/m6w6/libmemcached (FreeBSD **·** amd64) - -.. - - released YYYY-MM-DD - + * Sourcehut: https://builds.sr.ht/~m6w6/libmemcached (FreeBSD, OpenBSD **·** amd64) * Fix build failure due to comparison of incompatible types in bin/memflush and bin/memstat. @@ -58,7 +58,7 @@ was incremented due to the following changes: * Fix `gh #62 `_\ : uint32_t overflow cause busy loop. * Removed restriction of UDP+IPv6. -* Fix SERVER_ERROR_MEMORY_ALLOCATION_FAILURE: +* Fix SERVER_ERROR_MEMORY_ALLOCATION_FAILURE: recognize more strings returned by the server. * Fix `gh #13 `_\ : reset continuum counter after freeing them. @@ -103,7 +103,7 @@ was incremented due to the following changes: * Fix memaslap: build fails with newer compiler versions. * Fix usage of strerror_r() implementations returning pointer to char. * Fix pipelining commands with memcached >= 1.6. -* Fixed memcached_stat_get_value(): buffer overflow. +* Fix memcached_stat_get_value(): buffer overflow. * Fix memcached_stat(): undefined behavior due to unintialized memcached_return_t. * Fix SASL tests: requires SASL_PWDB_CONF. * Fix bin/memaslap to idnentify itself as memaslap instead of memslap. @@ -113,6 +113,9 @@ was incremented due to the following changes: `gh #64 `_ and `gh #21 `_\ : clarify documentation on replication. +* Fix `gh #95 `_\ : + MEMCACHED_CALLBACK_GET_FAILURE and MEMCACHED_BEHAVIOR_BUFFER_REQUESTS +* Fix bin/memcat to output flags if requested with ``--flag``. ---- diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index 7b4c3498..250805d3 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -10,6 +10,7 @@ foreach(CLIENT IN LISTS CLIENTS) INSTALL_RPATH ${CMAKE_INSTALL_RPATH}/../${CMAKE_INSTALL_LIBDIR}) endif() install(TARGETS ${CLIENT} + COMPONENT bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach() diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt index 82e4d332..06b0c315 100644 --- a/src/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -40,9 +40,14 @@ target_include_directories(libhashkit PUBLIC configure_file(hashkitcon.h.in hashkitcon.h @ONLY) install(TARGETS libhashkit EXPORT libhashkit-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY + COMPONENT lib + NAMELINK_COMPONENT dev + DESTINATION ${CMAKE_INSTALL_LIBDIR}) export(EXPORT libhashkit-targets NAMESPACE libmemcached::) -install(EXPORT libhashkit-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) +install(EXPORT libhashkit-targets NAMESPACE libmemcached:: + COMPONENT dev + DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) install_public_headers( libhashkit diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt index 0287fcc9..c3d53893 100644 --- a/src/libmemcached/CMakeLists.txt +++ b/src/libmemcached/CMakeLists.txt @@ -120,9 +120,14 @@ target_include_directories(libmemcached PUBLIC enable_dtrace_for(libmemcached libmemcached_probes.d dtrace_probes.h) install(TARGETS libmemcached EXPORT libmemcached-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY + COMPONENT lib + NAMELINK_COMPONENT dev + DESTINATION ${CMAKE_INSTALL_LIBDIR}) export(EXPORT libmemcached-targets NAMESPACE libmemcached::) -install(EXPORT libmemcached-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) +install(EXPORT libmemcached-targets NAMESPACE libmemcached:: + COMPONENT dev + DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) install_public_headers( libmemcached diff --git a/src/libmemcachedprotocol/CMakeLists.txt b/src/libmemcachedprotocol/CMakeLists.txt index 43d59de1..fc031565 100644 --- a/src/libmemcachedprotocol/CMakeLists.txt +++ b/src/libmemcachedprotocol/CMakeLists.txt @@ -36,6 +36,11 @@ target_include_directories(libmemcachedprotocol PUBLIC $) install(TARGETS libmemcachedprotocol EXPORT libmemcachedprotocol-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY + COMPONENT lib + NAMELINK_COMPONENT dev + DESTINATION ${CMAKE_INSTALL_LIBDIR}) export(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::) -install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) +install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached:: + COMPONENT dev + DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) diff --git a/src/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt index b49d0d03..af2562cd 100644 --- a/src/libmemcachedutil/CMakeLists.txt +++ b/src/libmemcachedutil/CMakeLists.txt @@ -41,6 +41,11 @@ target_include_directories(libmemcachedutil PUBLIC $) install(TARGETS libmemcachedutil EXPORT libmemcachedutil-targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + LIBRARY + COMPONENT lib + NAMELINK_COMPONENT dev + DESTINATION ${CMAKE_INSTALL_LIBDIR}) export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::) -install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) +install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached:: + COMPONENT dev + DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 119e78bb..a2955623 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -1,15 +1,18 @@ install(FILES ax_libmemcached.m4 + COMPONENT dev DESTINATION ${CMAKE_INSTALL_DATADIR}/aclocal ) configure_file(example.cnf.in example.cnf @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/example.cnf + COMPONENT dev DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} ) configure_file(libmemcached.pc.in libmemcached.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmemcached.pc + COMPONENT dev DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) @@ -43,4 +46,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmemcached-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedprotocol-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedutil-version.cmake + COMPONENT dev DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/) -- 2.30.2