From d5837ae805f3c9db16d4828b84afb7404b0a01cf Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Thu, 12 Apr 2018 16:10:16 -0400 Subject: [PATCH] Bump minimum Bazel version to 0.12.0 on Mac --- CMakeLists.txt | 8 +++++++- doc/developers.rst | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4107da314066..487896639e06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,13 @@ if(CYGWIN OR NOT UNIX) message(FATAL_ERROR "Cygwin and non-Unix platforms are NOT supported") endif() -find_package(Bazel 0.10.1 MODULE REQUIRED) +if(APPLE) + set(MINIMUM_BAZEL_VERSION 0.12.0) +else() + set(MINIMUM_BAZEL_VERSION 0.10.1) +endif() + +find_package(Bazel ${MINIMUM_BAZEL_VERSION} MODULE REQUIRED) get_filename_component(C_COMPILER_REALPATH "${CMAKE_C_COMPILER}" REALPATH) get_filename_component(C_COMPILER_NAME "${C_COMPILER_REALPATH}" NAME) diff --git a/doc/developers.rst b/doc/developers.rst index 6b381b52d354..850760cae474 100644 --- a/doc/developers.rst +++ b/doc/developers.rst @@ -81,8 +81,8 @@ supported for CMake builds using the "Unix Makefiles" generator. | Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.10.1 | | Clang 4.0 | OpenJDK 8 | R2017a | 2.7.11 | | | | CMake 3.5.1 | | GCC 5.4 | | | | +-----------------------------+-----------------+--------------------+------------+ +--------+ -| macOS 10.12 ("Sierra") | | Bazel 0.10.1 | Apple Clang 9.0.0 | Oracle 1.8 | | 2.7.14 | -+-----------------------------+ | CMake 3.10.2 | | +-------------------+ | +| macOS 10.12 ("Sierra") | | Bazel 0.12.0 | Apple Clang 9.0.0 | Oracle 1.8 | | 2.7.14 | ++-----------------------------+ | CMake 3.11.0 | | +-------------------+ | | macOS 10.13 ("High Sierra") | | | | R2017b | | +-----------------------------+-----------------+--------------------+------------+-------------------+--------+