From 47e39907785cefb1dd9b5c2284681919d644bdf5 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 17 Dec 2020 15:21:05 +0100 Subject: [PATCH] cpack: artifacts --- .builds/freebsd.yml | 3 ++- .builds/openbsd.yml | 3 ++- .github/workflows/cmake-build-ci.gen | 4 ++-- CMakeConfig.txt | 2 +- contrib/bin/memaslap/CMakeLists.txt | 3 +-- src/bin/CMakeLists.txt | 4 +--- src/libhashkit/CMakeLists.txt | 6 +++--- src/libmemcached/CMakeLists.txt | 6 +++--- src/libmemcachedprotocol/CMakeLists.txt | 6 +++--- src/libmemcachedutil/CMakeLists.txt | 6 +++--- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index b7db3cfc..51e6ea44 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -40,8 +40,9 @@ tasks: - test: | cmake --build debug -j2 --target test - install: | - cmake --build debug -j2 --target install -- DESTDIR=/tmp + cmake --install debug --prefix /tmp - package: | cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS_MANGZ=ON -S libmemcached -B release cmake --build release -j2 --target package -- VERBOSE= + cmake -DCPACK_COMPONENT_INSTALL=ON release cmake --build release -j2 --target push-artifacts -- VERBOSE= diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index ed3e21e2..c04c12c5 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -29,8 +29,9 @@ tasks: - test: | cmake --build debug -j2 --target test - install: | - cmake --build debug -j2 --target install -- DESTDIR=/tmp + cmake --install debug --prefix /tmp - package: | cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS_MANGZ=ON -S libmemcached -B release cmake --build release -j2 --target package -- VERBOSE= + cmake -DCPACK_COMPONENT_INSTALL=ON release cmake --build release -j2 --target push-artifacts -- VERBOSE= diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 06bc0383..a7e896cf 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -191,7 +191,7 @@ function steps_test() { run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test - name: Install if: env.BUILD_TESTING == 'ON' - run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --prefix /tmp + run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} --prefix /tmp - name: Failed tests log if: ${{ env.BUILD_TESTING == 'ON' && failure() }} run: cat build/Testing/Temporary/LastTest.log || true @@ -223,7 +223,7 @@ function steps_notify() { --data-urlencode "level=info" \ --data-urlencode "message=Github [${GITHUB_REPOSITORY}](https://github.com/${GITHUB_REPOSITORY}/commits/${REF}) (${REF}) [success](https://github.com/m6w6/libmemcached/actions/runs/${GITHUB_RUN_ID}) (${ImageOS}/${CC:-${CC_VND}-${CC_VER}})" - name: Notify Gitter (failure) - if: ${{ failure() && runner.os!='Windows'}} + if: ${{ failure() && runner.os != 'Windows'}} run: | REF=$(basename ${GITHUB_REF}) curl -sS "${{ secrets.GITTER }}" \ diff --git a/CMakeConfig.txt b/CMakeConfig.txt index 608de561..973ff824 100644 --- a/CMakeConfig.txt +++ b/CMakeConfig.txt @@ -20,7 +20,7 @@ endif() if(${CMAKE_VERSION} VERSION_LESS "3.12") set(TARGET_NAMELINK_COMPONENT "") else() - set(TARGET_NAMELINK_COMPONENT NAMELINK_COMPONENT dev) + set(TARGET_NAMELINK_COMPONENT NAMELINK_COMPONENT dev DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() option(BUILD_TESTING "whether to enable build of the test suite" diff --git a/contrib/bin/memaslap/CMakeLists.txt b/contrib/bin/memaslap/CMakeLists.txt index 3d8d9699..3f7f927d 100644 --- a/contrib/bin/memaslap/CMakeLists.txt +++ b/contrib/bin/memaslap/CMakeLists.txt @@ -31,8 +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}) + RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() endif() diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index 250805d3..d28d821c 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -9,9 +9,7 @@ foreach(CLIENT IN LISTS CLIENTS) set_target_properties(${CLIENT} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}/../${CMAKE_INSTALL_LIBDIR}) endif() - install(TARGETS ${CLIENT} - COMPONENT bin - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${CLIENT} RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach() # extra sources diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt index 1a03de23..64c60389 100644 --- a/src/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -40,10 +40,10 @@ target_include_directories(libhashkit PUBLIC configure_file(hashkitcon.h.in hashkitcon.h @ONLY) install(TARGETS libhashkit EXPORT libhashkit-targets - LIBRARY - COMPONENT lib + RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR} ${TARGET_NAMELINK_COMPONENT} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ) export(EXPORT libhashkit-targets NAMESPACE libmemcached::) install(EXPORT libhashkit-targets NAMESPACE libmemcached:: COMPONENT dev diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt index a6de76b7..8b563308 100644 --- a/src/libmemcached/CMakeLists.txt +++ b/src/libmemcached/CMakeLists.txt @@ -120,10 +120,10 @@ target_include_directories(libmemcached PUBLIC enable_dtrace_for(libmemcached libmemcached_probes.d dtrace_probes.h) install(TARGETS libmemcached EXPORT libmemcached-targets - LIBRARY - COMPONENT lib + RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR} ${TARGET_NAMELINK_COMPONENT} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ) export(EXPORT libmemcached-targets NAMESPACE libmemcached::) install(EXPORT libmemcached-targets NAMESPACE libmemcached:: COMPONENT dev diff --git a/src/libmemcachedprotocol/CMakeLists.txt b/src/libmemcachedprotocol/CMakeLists.txt index 2add5133..e0a31512 100644 --- a/src/libmemcachedprotocol/CMakeLists.txt +++ b/src/libmemcachedprotocol/CMakeLists.txt @@ -36,10 +36,10 @@ target_include_directories(libmemcachedprotocol PUBLIC $) install(TARGETS libmemcachedprotocol EXPORT libmemcachedprotocol-targets - LIBRARY - COMPONENT lib + RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR} ${TARGET_NAMELINK_COMPONENT} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ) export(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::) install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached:: COMPONENT dev diff --git a/src/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt index f1b33fb6..d135f35b 100644 --- a/src/libmemcachedutil/CMakeLists.txt +++ b/src/libmemcachedutil/CMakeLists.txt @@ -41,10 +41,10 @@ target_include_directories(libmemcachedutil PUBLIC $) install(TARGETS libmemcachedutil EXPORT libmemcachedutil-targets - LIBRARY - COMPONENT lib + RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR} ${TARGET_NAMELINK_COMPONENT} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ) export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::) install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached:: COMPONENT dev -- 2.30.2