From e6d1493ad11f56fe17ebcb98bf1d83e1f2733910 Mon Sep 17 00:00:00 2001 From: Greg Miller <9447643+devjgm@users.noreply.github.com> Date: Tue, 9 Apr 2019 10:16:22 -0400 Subject: [PATCH] Standardize documentation on "cmake-out" for cmake's binary output. (#2399) --- .dockerignore | 1 + .gitignore | 1 + .travis.yml | 4 +- CONTRIBUTING.md | 4 +- INSTALL.md | 108 +++++++++++----------- README.md | 33 +++---- ci/build-jenkins.sh | 6 +- ci/check-style.sh | 1 + ci/kokoro/docker/check-abi-presubmit.cfg | 2 +- ci/kokoro/docker/check-abi.cfg | 2 +- ci/kokoro/windows/build-project.ps1 | 8 +- ci/test-readme/Dockerfile.centos | 24 ++--- ci/test-readme/Dockerfile.debian | 24 ++--- ci/test-readme/Dockerfile.fedora | 20 ++-- ci/test-readme/Dockerfile.opensuse | 20 ++-- ci/test-readme/Dockerfile.opensuse-leap | 24 ++--- ci/test-readme/Dockerfile.ubuntu | 24 ++--- ci/test-readme/Dockerfile.ubuntu-trusty | 24 ++--- ci/test-readme/Dockerfile.ubuntu-xenial | 24 ++--- ci/test-readme/generate-install.sh | 4 +- ci/travis/Dockerfile.ubuntu-install | 20 ++-- ci/travis/build-docker.sh | 10 +- ci/travis/dump-logs.sh | 2 +- ci/travis/dump-reports.sh | 4 +- ci/travis/linux-config.sh | 4 +- ci/travis/upload-codecov.sh | 2 +- cmake/GoogleCloudCppCommon.cmake | 2 +- doc/cutting-a-release.md | 2 +- doc/setup-development-environment.md | 16 ++-- google/cloud/storage/doc/storage-main.dox | 2 +- 30 files changed, 213 insertions(+), 209 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3254e11a64fb..5547ef620a61 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,7 @@ _build/ build-output/ cmake-build-*/ +cmake-out/ # Skip these directories, the files here are not needed to build any of # the Docker images. Furthermore, when creating new Dockerfiles the files diff --git a/.gitignore b/.gitignore index 8d7944391c84..a5aa946669cd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .build/ _build/ build-output/ +cmake-out/ # Common bazel output directories bazel-* diff --git a/.travis.yml b/.travis.yml index f745913164c9..881d96e0fed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ git: install: # The git default is to recurse, override it because we do not need to and # that saves time. - - travis_wait 20 /bin/sh -c "ci/install-retry.sh ci/travis/install-linux.sh >build-output/install-linux.log 2>&1" + - travis_wait 20 /bin/sh -c "ci/install-retry.sh ci/travis/install-linux.sh >cmake-out/install-linux.log 2>&1" after_success: - ci/travis/upload-codecov.sh @@ -65,7 +65,7 @@ cache: # Cache the Bazel directories, in builds that do not use Bazel this is # empty and trivial to cache. - $HOME/.cache/bazel - - build-output/ccache + - cmake-out/ccache timeout: 900 before_cache: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47ac6395c577..a9cf03fbb426 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -170,7 +170,7 @@ If your workstation has multiple compilers (or multiple versions of a compiler) installed, you can change the compiler using: ```console -# Run this in your build directory, typically google-cloud-cpp/.build +# Run this in your build directory, typically google-cloud-cpp/cmake-out $ CXX=clang++ CC=clang cmake .. # Then compile and test normally: @@ -184,7 +184,7 @@ By default, the system is compiled with optimizations on; if you want to compile a debug version, use: ```console -# Run this in your build directory, typically google-cloud-cpp/.build +# Run this in your build directory, typically google-cloud-cpp/cmake-out $ CXX=clang++ CC=clang cmake -DCMAKE_BUILD_TYPE=Debug .. # Then compile and test normally: diff --git a/INSTALL.md b/INSTALL.md index e6a00d5efa6d..9e8717996314 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -15,9 +15,9 @@ CMake support files, then compiling and installing the libraries requires two commands: ```bash -cmake -H. -Bbuild-output-for-install \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -cmake --build build-output-for-install --target install +cmake --build cmake-out --target install ``` Unfortunately getting your system to this state may require multiple steps, @@ -178,8 +178,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -189,11 +189,11 @@ We can now compile and install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -233,8 +233,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -244,11 +244,11 @@ We can now compile and install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -279,8 +279,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -299,8 +299,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -359,11 +359,11 @@ We can now compile and install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -395,8 +395,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -415,8 +415,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -441,11 +441,11 @@ Finally we can install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -477,8 +477,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -497,8 +497,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -547,11 +547,11 @@ Finally we can install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -629,8 +629,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -649,8 +649,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -698,12 +698,12 @@ We can now compile and install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DCMAKE_FIND_ROOT_PATH="/usr/local/curl;/usr/local/ssl" \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -743,8 +743,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -763,8 +763,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -789,11 +789,11 @@ Finally we can install `google-cloud-cpp`. ```bash cd $HOME/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` @@ -832,8 +832,8 @@ cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -sudo cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +sudo cmake --build cmake-out/crc32c --target install -- -j $(nproc) sudo ldconfig ``` @@ -850,8 +850,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -sudo cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +sudo cmake --build cmake-out --target install -- -j $(nproc) sudo ldconfig ``` @@ -893,11 +893,11 @@ Finally we can install `google-cloud-cpp`. ```bash cd $HOME/Downloads/google-cloud-cpp -cmake -H. -Bbuild-output \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -cmake --build build-output -- -j $(nproc) -cd $HOME/Downloads/google-cloud-cpp/build-output +cmake --build cmake-out -- -j $(nproc) +cd $HOME/Downloads/google-cloud-cpp/cmake-out ctest --output-on-failure sudo cmake --build . --target install ``` diff --git a/README.md b/README.md index b682a3153a36..15d78b1dc134 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ sudo dnf makecache && \ sudo dnf install -y cmake gcc-c++ git make openssl-devel pkgconfig zlib-devel ``` -### openSUSE (Tumbleweed) +### OpenSUSE (Tumbleweed) [![Kokoro install opensuse status][kokoro-install-opensuse-shield]][kokoro-install-opensuse-link] @@ -203,7 +203,8 @@ sudo dnf install -y cmake gcc-c++ git make openssl-devel pkgconfig zlib-devel ```bash sudo zypper refresh && \ -sudo zypper install -y cmake gcc gcc-c++ git libcurl-devel libopenssl-devel make +sudo zypper install --allow-downgrade -y cmake gcc gcc-c++ git gzip \ + libcurl-devel libopenssl-devel make tar wget ``` ### OpenSUSE (Leap) @@ -215,8 +216,8 @@ sudo zypper install -y cmake gcc gcc-c++ git libcurl-devel libopenssl-devel make ```bash sudo zypper refresh && \ -sudo zypper install -y cmake gcc gcc-c++ git gzip libcurl-devel \ - libopenssl-devel make tar wget +sudo zypper install --allow-downgrade -y cmake gcc gcc-c++ git gzip \ + libcurl-devel libopenssl-devel make tar wget ``` ### Ubuntu (18.04 - Bionic Beaver) @@ -324,32 +325,32 @@ after cloning this repo: ```bash # Add -DBUILD_TESTING=OFF to disable tests -cmake -H. -Bbuild-output +cmake -H. -Bcmake-out # Adjust the number of threads used by modifying parameter for `-j 4` -cmake --build build-output -- -j 4 +cmake --build cmake-out -- -j 4 # Verify build by running tests -(cd build-output && ctest --output-on-failure) +(cd cmake-out && ctest --output-on-failure) ``` -You will find compiled binaries in `build-output/` respective to their source paths. +You will find compiled binaries in `cmake-out/` respective to their source paths. #### macOS ```bash export OPENSSL_ROOT_DIR=/usr/local/opt/libressl # Add -DBUILD_TESTING=OFF to disable tests -cmake -H. -Bbuild-output +cmake -H. -Bcmake-out # Adjust the number of threads used by modifying parameter for `-j 4` -cmake --build build-output -- -j 4 +cmake --build cmake-out -- -j 4 # Verify build by running tests -(cd build-output && ctest --output-on-failure) +(cd cmake-out && ctest --output-on-failure) ``` -You will find compiled binaries in `build-output/` respective to their source paths. +You will find compiled binaries in `cmake-out/` respective to their source paths. #### Windows @@ -414,7 +415,7 @@ call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary Use CMake to create the build files: ```console -cmake -H. -Bbuild-output -GNinja ^ +cmake -H. -Bcmake-out -GNinja ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_TOOLCHAIN_FILE="%SOURCE%\vcpkg\scripts\buildsystems\vcpkg.cmake" ^ -DVCPKG_TARGET_TRIPLET=x64-windows-static ^ @@ -427,17 +428,17 @@ cmake -H. -Bbuild-output -GNinja ^ And compile the code: ```console -cmake --build build-output +cmake --build cmake-out ``` Finally, verify the unit tests pass: ```console -cd build-output +cd cmake-out ctest --output-on-failure ``` -You will find compiled binaries in `build-output\` respective to their +You will find compiled binaries in `cmake-out\` respective to their source directories. ### Install diff --git a/ci/build-jenkins.sh b/ci/build-jenkins.sh index a5d8c3f5d3d1..9da5c3fdd456 100755 --- a/ci/build-jenkins.sh +++ b/ci/build-jenkins.sh @@ -16,12 +16,12 @@ set -eu -cmake -DCMAKE_BUILD_TYPE=Release -H. -Bbuild-output -cmake --build build-output -- -j $(nproc) +cmake -DCMAKE_BUILD_TYPE=Release -H. -Bcmake-out +cmake --build cmake-out -- -j $(nproc) readonly PROJECT_ROOT=$(pwd) echo PROJECT_ROOT=${PROJECT_ROOT} -cd build-output +cd cmake-out ctest --output-on-failure readonly BTDIR="google/cloud/bigtable" diff --git a/ci/check-style.sh b/ci/check-style.sh index 5366afda0f3d..e3807fa7a382 100755 --- a/ci/check-style.sh +++ b/ci/check-style.sh @@ -36,6 +36,7 @@ find . \( -path ./.git \ -o -path ./build-output \ -o -path ./.build \ -o -path ./_build \ + -o -path ./cmake-out \ \) -prune \ -o \( -name 'CMakeLists.txt' \ -o -name '*.cmake' \ diff --git a/ci/kokoro/docker/check-abi-presubmit.cfg b/ci/kokoro/docker/check-abi-presubmit.cfg index b1b599dc3622..d4bd59eba99c 100644 --- a/ci/kokoro/docker/check-abi-presubmit.cfg +++ b/ci/kokoro/docker/check-abi-presubmit.cfg @@ -24,6 +24,6 @@ env_vars { action { define_artifacts { regex: "**/compat_report.html" - strip_prefix: "github/google-cloud-cpp/build-output/ubuntu-install-18.04-gcc-Debug-shared/compat_reports" + strip_prefix: "github/google-cloud-cpp/cmake-out/ubuntu-install-18.04-gcc-Debug-shared/compat_reports" } } diff --git a/ci/kokoro/docker/check-abi.cfg b/ci/kokoro/docker/check-abi.cfg index b1b599dc3622..d4bd59eba99c 100644 --- a/ci/kokoro/docker/check-abi.cfg +++ b/ci/kokoro/docker/check-abi.cfg @@ -24,6 +24,6 @@ env_vars { action { define_artifacts { regex: "**/compat_report.html" - strip_prefix: "github/google-cloud-cpp/build-output/ubuntu-install-18.04-gcc-Debug-shared/compat_reports" + strip_prefix: "github/google-cloud-cpp/cmake-out/ubuntu-install-18.04-gcc-Debug-shared/compat_reports" } } diff --git a/ci/kokoro/windows/build-project.ps1 b/ci/kokoro/windows/build-project.ps1 index 7f374de363ca..dce23a967ed2 100644 --- a/ci/kokoro/windows/build-project.ps1 +++ b/ci/kokoro/windows/build-project.ps1 @@ -29,8 +29,8 @@ $CONFIG = $env:CONFIG $PROVIDER = $env:PROVIDER $GENERATOR = "Ninja" -# By default assume "module", use the configuration parameters and build in the `build-output` directory. -$cmake_flags=@("-G$GENERATOR", "-DCMAKE_BUILD_TYPE=$CONFIG", "-H.", "-Bbuild-output") +# By default assume "module", use the configuration parameters and build in the `cmake-out` directory. +$cmake_flags=@("-G$GENERATOR", "-DCMAKE_BUILD_TYPE=$CONFIG", "-H.", "-Bcmake-out") # This script expects vcpkg to be installed in ..\vcpkg, discover the full # path to that directory: @@ -55,14 +55,14 @@ if ($LastExitCode) { Write-Host Get-Date -Format o Write-Host "Compiling with CMake $env:CONFIG" -cmake --build build-output --config $CONFIG +cmake --build cmake-out --config $CONFIG if ($LastExitCode) { throw "cmake for 'all' target failed with exit code $LastExitCode" } Write-Host Get-Date -Format o -cd build-output +cd cmake-out ctest --output-on-failure -C $CONFIG if ($LastExitCode) { throw "ctest failed with exit code $LastExitCode" diff --git a/ci/test-readme/Dockerfile.centos b/ci/test-readme/Dockerfile.centos index 95d18ae2ede2..ab1462f035d6 100644 --- a/ci/test-readme/Dockerfile.centos +++ b/ci/test-readme/Dockerfile.centos @@ -45,9 +45,9 @@ RUN ln -sf /usr/bin/cmake3 /usr/bin/cmake && ln -sf /usr/bin/ctest3 /usr/bin/cte # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # #### crc32c @@ -65,8 +65,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -83,8 +83,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -127,11 +127,11 @@ RUN ldconfig # ```bash WORKDIR /var/tmp/build/google-cloud-cpp COPY . /var/tmp/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /var/tmp/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /var/tmp/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -145,5 +145,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.debian b/ci/test-readme/Dockerfile.debian index 3b40cecaa571..fdc032d109ff 100644 --- a/ci/test-readme/Dockerfile.debian +++ b/ci/test-readme/Dockerfile.debian @@ -46,9 +46,9 @@ RUN apt update && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # #### crc32c @@ -66,8 +66,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -86,8 +86,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -113,11 +113,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -132,5 +132,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.fedora b/ci/test-readme/Dockerfile.fedora index eb83d58e8788..deea6eb21544 100644 --- a/ci/test-readme/Dockerfile.fedora +++ b/ci/test-readme/Dockerfile.fedora @@ -37,9 +37,9 @@ RUN dnf makecache && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # Fedora includes packages for gRPC, libcurl, and OpenSSL that are recent enough @@ -67,8 +67,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -79,11 +79,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -98,5 +98,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.opensuse b/ci/test-readme/Dockerfile.opensuse index 2b1c80e55e83..ca19780790a3 100644 --- a/ci/test-readme/Dockerfile.opensuse +++ b/ci/test-readme/Dockerfile.opensuse @@ -34,9 +34,9 @@ RUN zypper refresh && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # OpenSUSE:tumbleweed provides packages for gRPC, libcurl, and protobuf, and the @@ -63,8 +63,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -75,11 +75,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -94,5 +94,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.opensuse-leap b/ci/test-readme/Dockerfile.opensuse-leap index 7b7483ec7481..856a9a743c5b 100644 --- a/ci/test-readme/Dockerfile.opensuse-leap +++ b/ci/test-readme/Dockerfile.opensuse-leap @@ -34,9 +34,9 @@ RUN zypper refresh && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # #### crc32c @@ -54,8 +54,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -74,8 +74,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -135,11 +135,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -154,5 +154,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.ubuntu b/ci/test-readme/Dockerfile.ubuntu index 1c8467b8adda..3a9843a15b63 100644 --- a/ci/test-readme/Dockerfile.ubuntu +++ b/ci/test-readme/Dockerfile.ubuntu @@ -38,9 +38,9 @@ RUN apt update && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # #### crc32c @@ -58,8 +58,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -78,8 +78,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -105,11 +105,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -124,5 +124,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.ubuntu-trusty b/ci/test-readme/Dockerfile.ubuntu-trusty index a0253eb44b76..a8e24065402b 100644 --- a/ci/test-readme/Dockerfile.ubuntu-trusty +++ b/ci/test-readme/Dockerfile.ubuntu-trusty @@ -67,9 +67,9 @@ ENV PKG_CONFIG_PATH=/usr/local/ssl/lib/pkgconfig # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] ## [END README.md] @@ -105,8 +105,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -125,8 +125,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -175,12 +175,12 @@ RUN make install # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DCMAKE_FIND_ROOT_PATH="/usr/local/curl;/usr/local/ssl" \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -194,5 +194,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN cmake -H. -B.build -DCMAKE_FIND_ROOT_PATH="/usr/local/curl;/usr/local/ssl" -RUN cmake --build .build -- -j $(nproc) +RUN cmake -H. -Bcmake-out -DCMAKE_FIND_ROOT_PATH="/usr/local/curl;/usr/local/ssl" +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/Dockerfile.ubuntu-xenial b/ci/test-readme/Dockerfile.ubuntu-xenial index 1ec56f90bbfb..32d9f97b521f 100644 --- a/ci/test-readme/Dockerfile.ubuntu-xenial +++ b/ci/test-readme/Dockerfile.ubuntu-xenial @@ -38,9 +38,9 @@ RUN apt update && \ # external projects. WORKDIR /home/build/external COPY . /home/build/external -RUN cmake -H. -Bbuild-output -DCMAKE_BUILD_TYPE=Debug -RUN cmake --build build-output -- -j $(nproc) -RUN (cd build-output && ctest --output-on-failure) +RUN cmake -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug +RUN cmake --build cmake-out -- -j $(nproc) +RUN (cd cmake-out && ctest --output-on-failure) ## [END IGNORED] # #### crc32c @@ -58,8 +58,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j $(nproc) + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j $(nproc) RUN ldconfig # ``` @@ -78,8 +78,8 @@ RUN cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build -RUN cmake --build .build --target install -- -j $(nproc) + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j $(nproc) RUN ldconfig # ``` @@ -129,11 +129,11 @@ RUN ldconfig # ```bash WORKDIR /home/build/google-cloud-cpp COPY . /home/build/google-cloud-cpp -RUN cmake -H. -Bbuild-output \ +RUN cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package \ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=external -RUN cmake --build build-output -- -j $(nproc) -WORKDIR /home/build/google-cloud-cpp/build-output +RUN cmake --build cmake-out -- -j $(nproc) +WORKDIR /home/build/google-cloud-cpp/cmake-out RUN ctest --output-on-failure RUN cmake --build . --target install # ``` @@ -147,5 +147,5 @@ RUN make WORKDIR /home/build/test-install-cmake COPY ci/test-install /home/build/test-install-cmake -RUN env -u PKG_CONFIG_PATH cmake -H. -B.build -RUN cmake --build .build -- -j $(nproc) +RUN env -u PKG_CONFIG_PATH cmake -H. -Bcmake-out +RUN cmake --build cmake-out -- -j $(nproc) diff --git a/ci/test-readme/generate-install.sh b/ci/test-readme/generate-install.sh index 15355d89793c..688349af620f 100755 --- a/ci/test-readme/generate-install.sh +++ b/ci/test-readme/generate-install.sh @@ -36,9 +36,9 @@ CMake support files, then compiling and installing the libraries requires two commands: ```bash -cmake -H. -Bbuild-output-for-install \ +cmake -H. -Bcmake-out \ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -cmake --build build-output-for-install --target install +cmake --build cmake-out --target install ``` Unfortunately getting your system to this state may require multiple steps, diff --git a/ci/travis/Dockerfile.ubuntu-install b/ci/travis/Dockerfile.ubuntu-install index 6060ce92feaa..6c89dd9abc21 100644 --- a/ci/travis/Dockerfile.ubuntu-install +++ b/ci/travis/Dockerfile.ubuntu-install @@ -93,8 +93,8 @@ RUN cmake \ -DCRC32C_BUILD_TESTS=OFF \ -DCRC32C_BUILD_BENCHMARKS=OFF \ -DCRC32C_USE_GLOG=OFF \ - -H. -B.build/crc32c -RUN cmake --build .build/crc32c --target install -- -j ${NCPU} + -H. -Bcmake-out/crc32c +RUN cmake --build cmake-out/crc32c --target install -- -j ${NCPU} RUN ldconfig # Install protobuf using CMake. Some distributions include protobuf, but gRPC @@ -113,8 +113,8 @@ RUN for build_type in "Debug" "Release"; do \ -DCMAKE_BUILD_TYPE="${build_type}" \ -DBUILD_SHARED_LIBS=yes \ -Dprotobuf_BUILD_TESTS=OFF \ - -H. -B.build-${build_type}; \ - cmake --build .build-${build_type} --target install -- -j ${NCPU}; \ + -H. -Bcmake-out-${build_type}; \ + cmake --build cmake-out-${build_type} --target install -- -j ${NCPU}; \ done RUN ldconfig @@ -130,8 +130,8 @@ WORKDIR /var/tmp/build/c-ares-cares-1_14_0 RUN cmake \ -DCMAKE_BUILD_TYPE="Release" \ -DBUILD_SHARED_LIBS=yes \ - -H. -B.build -RUN cmake --build .build --target install -- -j ${NCPU} + -H. -Bcmake-out +RUN cmake --build cmake-out --target install -- -j ${NCPU} RUN ./buildconf RUN ./configure RUN install -m 644 -D -t /usr/local/lib/pkgconfig libcares.pc @@ -153,8 +153,8 @@ RUN cmake \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_CARES_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ - -H. -B.build/grpc -RUN cmake --build .build/grpc --target install -- -j ${NCPU} + -H. -Bcmake-out/grpc +RUN cmake --build cmake-out/grpc --target install -- -j ${NCPU} RUN make install-pkg-config_c install-pkg-config_cxx install-certs RUN ldconfig @@ -166,8 +166,8 @@ WORKDIR /var/tmp/build/googletest-b6cd405286ed8635ece71c72f118e659f4ade3fb RUN cmake \ -DCMAKE_BUILD_TYPE="Release" \ -DBUILD_SHARED_LIBS=yes \ - -H. -B.build/googletest -RUN cmake --build .build/googletest --target install -- -j ${NCPU} + -H. -Bcmake-out/googletest +RUN cmake --build cmake-out/googletest --target install -- -j ${NCPU} RUN ldconfig RUN find /usr/local -type d | xargs chmod 777 diff --git a/ci/travis/build-docker.sh b/ci/travis/build-docker.sh index 64966bfe386b..6e3e2489c2e6 100755 --- a/ci/travis/build-docker.sh +++ b/ci/travis/build-docker.sh @@ -173,8 +173,8 @@ if [[ "${TEST_INSTALL:-}" = "yes" ]]; then echo echo "${COLOR_YELLOW}Test installed libraries using cmake(1).${COLOR_RESET}" readonly TEST_INSTALL_DIR="${PROJECT_ROOT}/ci/test-install" - readonly TEST_INSTALL_CMAKE_OUTPUT_DIR="${PROJECT_ROOT}/build-output/test-install-cmake" - readonly TEST_INSTALL_MAKE_OUTPUT_DIR="${PROJECT_ROOT}/build-output/test-install-make" + readonly TEST_INSTALL_CMAKE_OUTPUT_DIR="${PROJECT_ROOT}/cmake-out/test-install-cmake" + readonly TEST_INSTALL_MAKE_OUTPUT_DIR="${PROJECT_ROOT}/cmake-out/test-install-make" cmake -H"${TEST_INSTALL_DIR}" -B"${TEST_INSTALL_CMAKE_OUTPUT_DIR}" -DCMAKE_CXX_COMPILER=${CXX} cmake --build "${TEST_INSTALL_CMAKE_OUTPUT_DIR}" echo @@ -237,9 +237,9 @@ fi # the developers on how to do that locally. if [ "${SCAN_BUILD:-}" = "yes" ]; then if [ -n "$(ls -1d /tmp/scan-build-* 2>/dev/null)" ]; then - cp -r /tmp/scan-build-* /v/scan-build-output + cp -r /tmp/scan-build-* /v/scan-cmake-out fi - if [ -r scan-build-output/index.html ]; then + if [ -r scan-cmake-out/index.html ]; then cat <<_EOF_; ${COLOR_RED} @@ -250,7 +250,7 @@ then run: DISTRO=ubuntu DISTRO_VERSION=18.04 SCAN_BUILD=yes NCPU=8 CXX=clang++ CC=clang \ ./ci/travis/build-linux.sh -The HTML output will be copied into the scan-build-output subdirectory. +The HTML output will be copied into the scan-cmake-out subdirectory. ${COLOR_RESET} _EOF_ exit 1 diff --git a/ci/travis/dump-logs.sh b/ci/travis/dump-logs.sh index 0ee801d64b03..2ae9fcc65af8 100755 --- a/ci/travis/dump-logs.sh +++ b/ci/travis/dump-logs.sh @@ -24,7 +24,7 @@ source "${PROJECT_ROOT}/ci/define-dump-log.sh" # Dump the image installation log. echo -dump_log "build-output/install-linux.log" +dump_log "cmake-out/install-linux.log" # Dump the emulator log file. Tests run in the google/cloud/bigtable/tests directory. echo diff --git a/ci/travis/dump-reports.sh b/ci/travis/dump-reports.sh index dbdd0dcf2335..adc8d4e27868 100755 --- a/ci/travis/dump-reports.sh +++ b/ci/travis/dump-reports.sh @@ -41,12 +41,12 @@ export -f dump_report # Find any analysis reports, currently ABI checks and Clang static analysis are # the two things that produce them. Note that the Clang static analysis reports -# are copied into the scan-build-output directory by the build-docker.sh script. +# are copied into the scan-cmake-out directory by the build-docker.sh script. find "${BUILD_OUTPUT}" -name 'compat_report.html' \ -exec bash -c "dump_report '{}'" \; 2>/dev/null || \ echo "No ABI compability reports found." -find scan-build-output/ -name '*.html' \ +find scan-cmake-out/ -name '*.html' \ -exec bash -c "dump_report '{}'" \; 2>/dev/null || \ echo "No static analysis reports found." diff --git a/ci/travis/linux-config.sh b/ci/travis/linux-config.sh index b49d3c3191d5..950efee60118 100755 --- a/ci/travis/linux-config.sh +++ b/ci/travis/linux-config.sh @@ -47,6 +47,6 @@ else elif echo "${CMAKE_FLAGS}" | grep -Eq GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS=no; then suffix="${suffix}-noex" fi - readonly BUILD_OUTPUT="build-output/${IMAGE}${suffix}" - readonly DOCKER_CCACHE_DIR="build-output/ccache/${IMAGE}${suffix}" + readonly BUILD_OUTPUT="cmake-out/${IMAGE}${suffix}" + readonly DOCKER_CCACHE_DIR="cmake-out/ccache/${IMAGE}${suffix}" fi diff --git a/ci/travis/upload-codecov.sh b/ci/travis/upload-codecov.sh index 2e5753bb6e4e..8690de783f37 100755 --- a/ci/travis/upload-codecov.sh +++ b/ci/travis/upload-codecov.sh @@ -34,7 +34,7 @@ readonly CI_ENV=$(bash <(curl -s https://codecov.io/env)) sudo docker run $CI_ENV \ --volume $PWD:/v --workdir /v \ "${IMAGE}:tip" /bin/bash -c \ - "/bin/bash <(curl -s https://codecov.io/bash) -g './build-output/ccache/*' >/v/codecov.log 2>&1" + "/bin/bash <(curl -s https://codecov.io/bash) -g './cmake-out/ccache/*' >/v/codecov.log 2>&1" echo "DONE" dump_log codecov.log diff --git a/cmake/GoogleCloudCppCommon.cmake b/cmake/GoogleCloudCppCommon.cmake index e7b15666bb8f..8d6a5577bdba 100644 --- a/cmake/GoogleCloudCppCommon.cmake +++ b/cmake/GoogleCloudCppCommon.cmake @@ -60,7 +60,7 @@ else() set(DOXYGEN_RECURSIVE YES) set(DOXYGEN_FILE_PATTERNS *.h *.cc *.proto *.dox) set(DOXYGEN_EXAMPLE_RECURSIVE YES) - set(DOXYGEN_EXCLUDE "third_party" "cmake-build-debug" "build-output") + set(DOXYGEN_EXCLUDE "third_party" "cmake-build-debug" "cmake-out") set(DOXYGEN_EXCLUDE_SYMLINKS YES) set(DOXYGEN_QUIET YES) set(DOXYGEN_WARN_AS_ERROR YES) diff --git a/doc/cutting-a-release.md b/doc/cutting-a-release.md index 00ba8a35f17a..8f6e3746edd9 100644 --- a/doc/cutting-a-release.md +++ b/doc/cutting-a-release.md @@ -77,7 +77,7 @@ sed -i 's/set(GOOGLE_CLOUD_CPP_IS_RELEASE "")/set(GOOGLE_CLOUD_CPP_IS_RELEASE "y Run the CMake configuration step to update the Bazel configuration files: ```bash -cmake -H. -Bbuild-output +cmake -H. -Bcmake-out ``` You should expect that only `google/cloud/CMakeLists.txt` and diff --git a/doc/setup-development-environment.md b/doc/setup-development-environment.md index 77f6a6ef29fc..eaa31e950d2d 100644 --- a/doc/setup-development-environment.md +++ b/doc/setup-development-environment.md @@ -90,26 +90,26 @@ cd google-cloud-cpp And compile the code using: ```console -cmake -H. -B.build -cmake --build .build -- -j $(nproc) +cmake -H. -Bcmake-out +cmake --build cmake-out -- -j $(nproc) ``` Run the tests using: ```console -env -C .build ctest --output-on-failure +env -C cmake-out ctest --output-on-failure ``` Run the Google Cloud Storage integration tests: ```console -env -C .build $PWD/google/cloud/storage/ci/run_integration_tests.sh +env -C cmake-out $PWD/google/cloud/storage/ci/run_integration_tests.sh ``` Run the Google Cloud Bigtable integration tests: ```console -env -C .build \ +env -C cmake-out \ CBT=$HOME/google-cloud-sdk/bin/cbt \ CBT_EMULATOR=$HOME/google-cloud-sdk/platform/bigtable-emulator/cbtemulator \ $PWD/google/cloud/bigtable/ci/run_integration_tests.sh @@ -212,18 +212,18 @@ And compile the code using: ```console > call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -> cmake -GNinja -H. -B.build +> cmake -GNinja -H. -Bcmake-out -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=C:\Users\%USERNAME%\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -> cmake --build .build +> cmake --build cmake-out ``` Run the tests using: ```console -> cd .build +> cd cmake-out > ctest --output-on-failure ``` diff --git a/google/cloud/storage/doc/storage-main.dox b/google/cloud/storage/doc/storage-main.dox index 9e885d47f391..60b5e185c825 100644 --- a/google/cloud/storage/doc/storage-main.dox +++ b/google/cloud/storage/doc/storage-main.dox @@ -108,7 +108,7 @@ you run the quickstart program. Assuming you followed the build instructions referenced above this would be: @code -./build-output/google/cloud/storage/examples/quick_start [BUCKET_NAME] [PROJECT_ID] +./cmake-out/google/cloud/storage/examples/quick_start [BUCKET_NAME] [PROJECT_ID] @endcode ### Using GOOGLE_CLOUD_PROJECT to set the default project