From bbf8bc173f72e76afc696be33fb1a1337998f082 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Fri, 19 Jun 2020 21:39:30 +0200 Subject: [PATCH] Rename USE_LIBZSTD_FROM_INTERNET to ZSTD_FROM_INTERNET --- .travis.yml | 8 ++++---- CMakeLists.txt | 2 +- cmake/Findzstd.cmake | 4 ++-- doc/INSTALL.md | 2 +- test-all-systems.sh | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 565631225..f26a82340 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ jobs: # Job 2: Build on Linux with native 32-bit GCC - os: linux compiler: gcc - env: T="Linux GCC 32-bit" VERBOSE=1 CFLAGS="-m32 -g -O2" CXXFLAGS="-m32 -g -O2" LDFLAGS="-m32" CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ENABLE_CACHE_CLEANUP_TESTS=1 + env: T="Linux GCC 32-bit" VERBOSE=1 CFLAGS="-m32 -g -O2" CXXFLAGS="-m32 -g -O2" LDFLAGS="-m32" CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ENABLE_CACHE_CLEANUP_TESTS=1 addons: apt: packages: @@ -52,7 +52,7 @@ jobs: # Job 5: Build on Linux with 32-bit MinGW cross-compiler - os: linux compiler: i686-w64-mingw32-g++-posix - env: T="Linux MinGW 32-bit" VERBOSE=1 CC=i686-w64-mingw32-gcc-posix CXX=i686-w64-mingw32-g++-posix CMAKE_PARAMS="-DCMAKE_SYSTEM_NAME=Windows -DUSE_LIBZSTD_FROM_INTERNET=ON" RUN_TESTS=0 ENABLE_CACHE_CLEANUP_TESTS=1 + env: T="Linux MinGW 32-bit" VERBOSE=1 CC=i686-w64-mingw32-gcc-posix CXX=i686-w64-mingw32-g++-posix CMAKE_PARAMS="-DCMAKE_SYSTEM_NAME=Windows -DZSTD_FROM_INTERNET=ON" RUN_TESTS=0 ENABLE_CACHE_CLEANUP_TESTS=1 addons: apt: packages: @@ -61,7 +61,7 @@ jobs: # Job 6: Build on Linux with 64-bit MinGW cross-compiler - os: linux compiler: x86_64-w64-mingw32-g++ - env: T="Linux MinGW 64-bit" VERBOSE=1 CC=x86_64-w64-mingw32-gcc-posix CXX=x86_64-w64-mingw32-g++-posix CMAKE_PARAMS="-DCMAKE_SYSTEM_NAME=Windows -DUSE_LIBZSTD_FROM_INTERNET=ON" RUN_TESTS=0 ENABLE_CACHE_CLEANUP_TESTS=1 + env: T="Linux MinGW 64-bit" VERBOSE=1 CC=x86_64-w64-mingw32-gcc-posix CXX=x86_64-w64-mingw32-g++-posix CMAKE_PARAMS="-DCMAKE_SYSTEM_NAME=Windows -DZSTD_FROM_INTERNET=ON" RUN_TESTS=0 ENABLE_CACHE_CLEANUP_TESTS=1 addons: apt: packages: @@ -70,7 +70,7 @@ jobs: # Job 7: Build on MacOS with native Clang - os: osx compiler: clang - env: T="MacOS Clang" VERBOSE=1 CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ENABLE_CACHE_CLEANUP_TESTS=1 + env: T="MacOS Clang" VERBOSE=1 CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ENABLE_CACHE_CLEANUP_TESTS=1 # Job 8: Run Clang's undefined behavior sanitizer - os: linux diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a4ad08af..5f3c2f499 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ endif() # # Third party # -option(USE_LIBZSTD_FROM_INTERNET "Download and use libzstd from the Internet" OFF) +option(ZSTD_FROM_INTERNET "Download and use libzstd from the Internet" OFF) find_package(zstd 1.1.2 REQUIRED) # diff --git a/cmake/Findzstd.cmake b/cmake/Findzstd.cmake index 3aed65668..d53ba955c 100644 --- a/cmake/Findzstd.cmake +++ b/cmake/Findzstd.cmake @@ -2,7 +2,7 @@ if(zstd_FOUND) return() endif() -if(USE_LIBZSTD_FROM_INTERNET) +if(ZSTD_FROM_INTERNET) # Although ${zstd_FIND_VERSION} was requested, let's download a newer version. # Note: The directory structure has changed in 1.3.0; we only support 1.3.0 # and newer. @@ -36,7 +36,7 @@ else() include(FindPackageHandleStandardArgs) find_package_handle_standard_args( - zstd "please install libzstd or use -DUSE_LIBZSTD_FROM_INTERNET=ON" + zstd "please install libzstd or use -DZSTD_FROM_INTERNET=ON" ZSTD_INCLUDE_DIR ZSTD_LIBRARY) mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY) diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 3d35554d6..667977aa7 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -11,7 +11,7 @@ To build ccache you need: - A C99 compiler. - [libzstd](https://www.zstd.net). If you don't have libzstd installed and can't or don't want to install it on your system, you can pass - `-DUSE_LIBZSTD_FROM_INTERNET=ON` to cmake, which will download libzstd from + `-DZSTD_FROM_INTERNET=ON` to cmake, which will download libzstd from the Internet and unpack it in the local binary tree. ccache will then be linked statically to the locally built libzstd. diff --git a/test-all-systems.sh b/test-all-systems.sh index 0683ec94f..48c286056 100755 --- a/test-all-systems.sh +++ b/test-all-systems.sh @@ -28,23 +28,23 @@ echo "Warning: Docker support is rather experimental\n" # Ubuntu (ancient, old and latest) # zstd not available for Ubuntu 14. - CC=gcc CXX=g++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-trusty + CC=gcc CXX=g++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-trusty # See https://github.com/ccache/ccache/issues/601 - #CC=clang CXX=clang++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-tusty + #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-tusty CC=gcc CXX=g++ ./docker.sh ubuntu-16-xenial CC=clang CXX=clang++ ./docker.sh ubuntu-16-xenial - CC=gcc CXX=g++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal - CC=clang CXX=clang++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal + CC=gcc CXX=g++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal + CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal # Alpine (old and latest) - CC=gcc CXX=g++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4 + CC=gcc CXX=g++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4 # Clang is not capable to compile libzstd from internet before alpine 3.12 (Some SSE2 error regarding missing file emmintrin.h) - #CC=clang CXX=clang++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4 - CC=clang CXX=clang++ CMAKE_PARAMS="-DUSE_LIBZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.12 + #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4 + CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.12 CC=gcc CXX=g++ ./docker.sh alpine-3.12 CC=clang CXX=clang++ ./docker.sh alpine-3.12 -- 2.47.3