projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
7b2f2e6
)
cpack: artifacts
author
Michael Wallner
<mike@php.net>
Thu, 17 Dec 2020 14:21:05 +0000
(15:21 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 17 Dec 2020 14:21:05 +0000
(15:21 +0100)
.builds/freebsd.yml
patch
|
blob
|
history
.builds/openbsd.yml
patch
|
blob
|
history
.github/workflows/cmake-build-ci.gen
patch
|
blob
|
history
CMakeConfig.txt
patch
|
blob
|
history
contrib/bin/memaslap/CMakeLists.txt
patch
|
blob
|
history
src/bin/CMakeLists.txt
patch
|
blob
|
history
src/libhashkit/CMakeLists.txt
patch
|
blob
|
history
src/libmemcached/CMakeLists.txt
patch
|
blob
|
history
src/libmemcachedprotocol/CMakeLists.txt
patch
|
blob
|
history
src/libmemcachedutil/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/.builds/freebsd.yml
b/.builds/freebsd.yml
index b7db3cfc094d7030b47a4622253f635bb2b99384..51e6ea441d24e39ff3fc8c7a8fbf701cf8c42ee0 100644
(file)
--- a/
.builds/freebsd.yml
+++ b/
.builds/freebsd.yml
@@
-40,8
+40,9
@@
tasks:
- test: |
cmake --build debug -j2 --target test
- install: |
- 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=
- 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=
cmake --build release -j2 --target push-artifacts -- VERBOSE=
diff --git
a/.builds/openbsd.yml
b/.builds/openbsd.yml
index ed3e21e2c059eb5bfba4b747697b6a2385659bcf..c04c12c573e474dc0f4a0d97ab076e991e678fc7 100644
(file)
--- a/
.builds/openbsd.yml
+++ b/
.builds/openbsd.yml
@@
-29,8
+29,9
@@
tasks:
- test: |
cmake --build debug -j2 --target test
- install: |
- 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=
- 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=
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 06bc0383cf761ee7f278b5fef9f1522ade630867..a7e896cfabe9638ef9fd0081e49fd884dd16ae82 100755
(executable)
--- 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 --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
- 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)
--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 }}" \
run: |
REF=$(basename ${GITHUB_REF})
curl -sS "${{ secrets.GITTER }}" \
diff --git
a/CMakeConfig.txt
b/CMakeConfig.txt
index 608de5618ea21f01a3567a029b8873cebc643200..973ff8244d2cb0ebca052a0afdbec135fa8f129e 100644
(file)
--- a/
CMakeConfig.txt
+++ b/
CMakeConfig.txt
@@
-20,7
+20,7
@@
endif()
if(${CMAKE_VERSION} VERSION_LESS "3.12")
set(TARGET_NAMELINK_COMPONENT "")
else()
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"
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 3d8d9699138e297bd5aa36adffdf8acdea209968..3f7f927d50b7ed68fd5e01ac7161093118095523 100644
(file)
--- 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
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()
endif()
endif()
diff --git
a/src/bin/CMakeLists.txt
b/src/bin/CMakeLists.txt
index 250805d3112ba1bf64e3c98e1948356b02ab8740..d28d821c3feac0c814419c121727ba233e20a77d 100644
(file)
--- 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()
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
endforeach()
# extra sources
diff --git
a/src/libhashkit/CMakeLists.txt
b/src/libhashkit/CMakeLists.txt
index 1a03de2365f25a72eafa7882d913be7352b974d7..64c60389b2f691c2d8fea281f947b47fbb4492e8 100644
(file)
--- 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
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}
${TARGET_NAMELINK_COMPONENT}
-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ )
export(EXPORT libhashkit-targets NAMESPACE libmemcached::)
install(EXPORT libhashkit-targets NAMESPACE libmemcached::
COMPONENT dev
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 a6de76b771509fa8f826b6dc675f8327ff956f43..8b5633084f6f2876647a4f13ed010bba848da5b8 100644
(file)
--- 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
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}
${TARGET_NAMELINK_COMPONENT}
-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ )
export(EXPORT libmemcached-targets NAMESPACE libmemcached::)
install(EXPORT libmemcached-targets NAMESPACE libmemcached::
COMPONENT dev
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 2add5133ec9dda3ce6f3bf93f8783a03cbff85c3..e0a31512ce6e12c423857524d3452b0c8a7023df 100644
(file)
--- a/
src/libmemcachedprotocol/CMakeLists.txt
+++ b/
src/libmemcachedprotocol/CMakeLists.txt
@@
-36,10
+36,10
@@
target_include_directories(libmemcachedprotocol PUBLIC
$<INSTALL_INTERFACE:include>)
install(TARGETS libmemcachedprotocol EXPORT libmemcachedprotocol-targets
$<INSTALL_INTERFACE:include>)
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}
${TARGET_NAMELINK_COMPONENT}
-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ )
export(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::)
install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::
COMPONENT dev
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 f1b33fb6fac4af72a4601347c78a5f555c83550c..d135f35b7cf77bb10b1145dca73904f46274496e 100644
(file)
--- a/
src/libmemcachedutil/CMakeLists.txt
+++ b/
src/libmemcachedutil/CMakeLists.txt
@@
-41,10
+41,10
@@
target_include_directories(libmemcachedutil PUBLIC
$<INSTALL_INTERFACE:include>)
install(TARGETS libmemcachedutil EXPORT libmemcachedutil-targets
$<INSTALL_INTERFACE:include>)
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}
${TARGET_NAMELINK_COMPONENT}
-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
+ )
export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::)
install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::
COMPONENT dev
export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::)
install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::
COMPONENT dev