diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2020-08-22 20:50:55 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2020-08-22 20:50:55 +0200 |
| commit | 8c852f8ec353175cefd72fc933b93d727ed2ed2e (patch) | |
| tree | 97b0628b6a067b192524483b97cc509b11f384ac | |
| parent | c0abed863a52d62b81297a641b1ec44c8890a88d (diff) | |
| download | ccache-8c852f8ec353175cefd72fc933b93d727ed2ed2e.tar.gz | |
Rename BUILDEXTRAFLAGS to EXTRA_CMAKE_BUILD_FLAGS
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | ci/build | 2 | ||||
| -rwxr-xr-x | misc/build-in-docker | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 35c1e5df..10f5eb31 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 338cc7be..32366258 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: @@ -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 ad30ea87..76030969 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" \ |