Skip to content

Commit

Permalink
Bump minimum Bazel version to 0.12.0 on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Apr 12, 2018
1 parent 5614d3c commit d5837ae
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions doc/developers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
+-----------------------------+-----------------+--------------------+------------+-------------------+--------+

Expand Down

0 comments on commit d5837ae

Please sign in to comment.