From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 22 Aug 2020 18:50:55 +0000 (+0200)
Subject: Rename BUILDEXTRAFLAGS to EXTRA_CMAKE_BUILD_FLAGS
X-Git-Tag: v4.0~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c852f8ec353175cefd72fc933b93d727ed2ed2e;p=thirdparty%2Fccache.git

Rename BUILDEXTRAFLAGS to EXTRA_CMAKE_BUILD_FLAGS
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 35c1e5dfa..10f5eb31d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -167,14 +167,14 @@ jobs:
           # Job 14: Build documentation
           - name: Build documentation
             os: ubuntu-18.04
-            BUILDEXTRAFLAGS: --target documentation
+            EXTRA_CMAKE_BUILD_FLAGS: --target documentation
             RUN_TESTS: 0
             apt_get: libzstd1-dev asciidoc
 
           # Job 15: Build manpage
           - name: Build manpage
             os: ubuntu-18.04
-            BUILDEXTRAFLAGS: --target manpage
+            EXTRA_CMAKE_BUILD_FLAGS: --target manpage
             RUN_TESTS: 0
             apt_get: libzstd1-dev asciidoc xsltproc
 
diff --git a/.travis.yml b/.travis.yml
index 338cc7be7..323662585 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,7 +131,7 @@ jobs:
 
   # Job 13: Build documentation
   - os: linux
-    env: T="Build documentation" VERBOSE=1 BUILDEXTRAFLAGS="--target documentation" RUN_TESTS=0
+    env: T="Build documentation" VERBOSE=1 EXTRA_CMAKE_BUILD_FLAGS="--target documentation" RUN_TESTS=0
     addons:
       apt:
         packages:
@@ -141,7 +141,7 @@ jobs:
 
   # Job 15: Build manpage
   - os: linux
-    env: T="Build manpage" VERBOSE=1 BUILDEXTRAFLAGS="--target manpage" RUN_TESTS=0
+    env: T="Build manpage" VERBOSE=1 EXTRA_CMAKE_BUILD_FLAGS="--target manpage" RUN_TESTS=0
     addons:
       apt:
         packages:
@@ -162,7 +162,7 @@ jobs:
   # Job 17: Run Clang-Format in check mode
   - os: linux
     compiler: clang
-    env: T="Clang-Format" VERBOSE=1 BUILDEXTRAFLAGS="--target check_format" RUN_TESTS=0
+    env: T="Clang-Format" VERBOSE=1 EXTRA_CMAKE_BUILD_FLAGS="--target check_format" RUN_TESTS=0
     addons:
       apt:
         packages:
@@ -181,7 +181,7 @@ jobs:
   # Job 17: Run Clang-Format check mode
   - os: linux
     compiler: clang
-    env: T="Clang-Format" VERBOSE=1 BUILDEXTRAFLAGS="--target check_format" RUN_TESTS=0
+    env: T="Clang-Format" VERBOSE=1 EXTRA_CMAKE_BUILD_FLAGS="--target check_format" RUN_TESTS=0
     addons:
       apt:
         packages:
diff --git a/ci/build b/ci/build
index afa05ab78..3fe7e899a 100755
--- a/ci/build
+++ b/ci/build
@@ -17,7 +17,7 @@ else
     mkdir -p ${BUILDDIR:-build}
     cd ${BUILDDIR:-build}
     ${CMAKE_PREFIX:-} cmake ${CMAKE_PARAMS:-} ${CCACHE_LOC:-..}
-    ${CMAKE_PREFIX:-} cmake --build . ${BUILDEXTRAFLAGS:-} -- -j$JOBS
+    ${CMAKE_PREFIX:-} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS:-} -- -j$JOBS
     if [ "${RUN_TESTS:-1}" -eq 1 ]; then
         CC=${TEST_CC:-${CC}} ctest --output-on-failure -j$JOBS "$@"
     fi
diff --git a/misc/build-in-docker b/misc/build-in-docker
index ad30ea878..76030969e 100755
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -39,7 +39,7 @@ docker run \
     --tmpfs /builddir:rw,exec \
     --workdir /builddir \
     --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
-    --env BUILDEXTRAFLAGS="${BUILDEXTRAFLAGS:-}" \
+    --env EXTRA_CMAKE_BUILD_FLAGS="${EXTRA_CMAKE_BUILD_FLAGS:-}" \
     --env CC="${CC:-}" \
     --env CCACHE_DIR=/ccache \
     --env CCACHE_LOC="/source" \