projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
24f7972
)
cpack: artifacts
author
Michael Wallner
<mike@php.net>
Wed, 16 Dec 2020 13:33:30 +0000
(14:33 +0100)
committer
Michael Wallner
<mike@php.net>
Wed, 16 Dec 2020 13:45:44 +0000
(14:45 +0100)
.builds/freebsd.yml
patch
|
blob
|
history
.builds/openbsd.yml
patch
|
blob
|
history
CMake/FindSphinx.cmake
patch
|
blob
|
history
CMakeConfig.txt
patch
|
blob
|
history
docs/source/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/.builds/freebsd.yml
b/.builds/freebsd.yml
index 1cf06ee8dc1f55aab8bb3b89650774d85b50bbc6..b7db3cfc094d7030b47a4622253f635bb2b99384 100644
(file)
--- a/
.builds/freebsd.yml
+++ b/
.builds/freebsd.yml
@@
-14,7
+14,7
@@
packages:
sources:
- https://github.com/m6w6/libmemcached
secrets:
sources:
- https://github.com/m6w6/libmemcached
secrets:
- -
46f739e5-4538-45dd-a79f-bf173b7a2ed9
+ -
685c5b0a-395c-4031-97f8-97496bb6c25f
environment:
ENABLE_HASH_HSIEH: "ON"
ENABLE_MEMASLAP: "ON"
environment:
ENABLE_HASH_HSIEH: "ON"
ENABLE_MEMASLAP: "ON"
@@
-44,5
+44,4
@@
tasks:
- 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 --build release -j2 --target push-artifact -- VERBOSE=
-
+ cmake --build release -j2 --target push-artifacts -- VERBOSE=
diff --git
a/.builds/openbsd.yml
b/.builds/openbsd.yml
index d80bb0ac13b7364ac3f907d52e96b49b1aace81b..490db5fcf32b1e2cc81d2246d2f1a41b8be808d8 100644
(file)
--- a/
.builds/openbsd.yml
+++ b/
.builds/openbsd.yml
@@
-13,6
+13,8
@@
packages:
- tbb
sources:
- https://github.com/m6w6/libmemcached
- tbb
sources:
- https://github.com/m6w6/libmemcached
+secrets:
+ - 685c5b0a-395c-4031-97f8-97496bb6c25f
environment:
ENABLE_HASH_HSIEH: "ON"
ENABLE_MEMASLAP: "OFF"
environment:
ENABLE_HASH_HSIEH: "ON"
ENABLE_MEMASLAP: "OFF"
@@
-30,5
+32,4
@@
tasks:
- 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 --build release -j2 --target push-artifact -- VERBOSE=
-
+ cmake --build release -j2 --target push-artifacts -- VERBOSE=
diff --git
a/CMake/FindSphinx.cmake
b/CMake/FindSphinx.cmake
index 8b76fdc0fe5bcfb9e0751ffe6770246633b07a34..75604e8901780bbb2821d7ed4f58495463fdd729 100644
(file)
--- a/
CMake/FindSphinx.cmake
+++ b/
CMake/FindSphinx.cmake
@@
-1,4
+1,4
@@
-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
+find_program(SPHINX_EXECUTABLE NAMES sphinx-build
sphinx-build-3
HINTS $ENV{SPHINX_DIR}
PATH_SUFFIXES bin
DOC "Sphinx documentation generator"
HINTS $ENV{SPHINX_DIR}
PATH_SUFFIXES bin
DOC "Sphinx documentation generator"
diff --git
a/CMakeConfig.txt
b/CMakeConfig.txt
index e4fee7a67d991761b8546b29a691a00c3b6a9853..608de5618ea21f01a3567a029b8873cebc643200 100644
(file)
--- a/
CMakeConfig.txt
+++ b/
CMakeConfig.txt
@@
-35,6
+35,12
@@
option(BUILD_DOCS_MAN "build manpages"
${BUILD_DOCS})
option(BUILD_DOCS_MANGZ "gzip manpages"
${BUILD_DOCS_MAN})
${BUILD_DOCS})
option(BUILD_DOCS_MANGZ "gzip manpages"
${BUILD_DOCS_MAN})
+if(BUILD_DOCS_MANGZ)
+ set(BUILD_DOCS_MAN ON CACHE BOOL "forced by BUILD_DOCS_MANGZ" FORCE)
+endif()
+if(BUILD_DOCS_MAN OR BUILD_DOCS_HTML)
+ set(BUILD_DOCS ON CACHE BOOL "forced by BUILD_DOCS_MAN OR BUILD_DOCS_HTML" FORCE)
+endif()
set(ENABLE_SANITIZERS "$ENV{ENABLE_SANITIZERS}"
CACHE STRING "sanitizers to enable (e.g. address;undefined ...)")
set(ENABLE_SANITIZERS "$ENV{ENABLE_SANITIZERS}"
CACHE STRING "sanitizers to enable (e.g. address;undefined ...)")
@@
-73,12
+79,6
@@
if(BUILD_TESTING)
endif()
endif()
endif()
endif()
-if(BUILD_DOCS_MANGZ)
- set(BUILD_DOCS_MAN ON)
-endif()
-if(BUILD_DOCS_MAN OR BUILD_DOCS_HTML)
- set(BUILD_DOCS ON)
-endif()
if(BUILD_DOCS)
set(SPHINX_OPTIONS ""
CACHE STRING "additional sphinx-build command line options")
if(BUILD_DOCS)
set(SPHINX_OPTIONS ""
CACHE STRING "additional sphinx-build command line options")
diff --git
a/docs/source/CMakeLists.txt
b/docs/source/CMakeLists.txt
index ff330556df6e705cd51bc263ad0dae993b4936d5..3ee77d0d6a72954baed4ca4a26870a69d89986cc 100644
(file)
--- a/
docs/source/CMakeLists.txt
+++ b/
docs/source/CMakeLists.txt
@@
-1,4
+1,4
@@
-find_program(M2R
m2r
)
+find_program(M2R
NAMES m2r m2r-3
)
if(M2R)
file(GLOB CHANGELOGS "${CMAKE_SOURCE_DIR}/ChangeLog-*.md")
if(M2R)
file(GLOB CHANGELOGS "${CMAKE_SOURCE_DIR}/ChangeLog-*.md")