From: Michael Wallner <mike@php.net>
Date: Wed, 16 Dec 2020 13:33:30 +0000 (+0100)
Subject: cpack: artifacts
X-Git-Tag: 1.1.0-beta1~52
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b0e9a6474941f4222fc15bf431c4be9474f8dee1;p=m6w6%2Flibmemcached

cpack: artifacts
---

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 1cf06ee8..b7db3cfc 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -14,7 +14,7 @@ packages:
 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"
@@ -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=
-      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 d80bb0ac..490db5fc 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -13,6 +13,8 @@ packages:
   - tbb
 sources:
   - https://github.com/m6w6/libmemcached
+secrets:
+  - 685c5b0a-395c-4031-97f8-97496bb6c25f
 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=
-      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 8b76fdc0..75604e89 100644
--- 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"
diff --git a/CMakeConfig.txt b/CMakeConfig.txt
index e4fee7a6..608de561 100644
--- 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})
+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 ...)")
@@ -73,12 +79,6 @@ if(BUILD_TESTING)
     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")
diff --git a/docs/source/CMakeLists.txt b/docs/source/CMakeLists.txt
index ff330556..3ee77d0d 100644
--- 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")