Skip to content

Commit 307da34

Browse files
authored
Merge pull request #15091 from github/redsun82/fix-cmake-bazel-version
Bazel/CMake: use bazelisk to use correct bazel version
2 parents 4d922dd + 9e300a9 commit 307da34

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

misc/bazel/cmake/setup.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ if (CREATE_COMPILATION_DATABASE_LINK)
55
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
66
endif ()
77

8+
if (NOT DEFINED BAZEL_BIN)
9+
set(BAZEL_BIN "bazelisk")
10+
endif ()
11+
812
macro(bazel)
9-
execute_process(COMMAND bazel ${ARGN}
13+
execute_process(COMMAND ${BAZEL_BIN} ${ARGN}
1014
COMMAND_ERROR_IS_FATAL ANY
1115
OUTPUT_STRIP_TRAILING_WHITESPACE
1216
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})

0 commit comments

Comments
 (0)