@@ -20,6 +20,12 @@ macro(bazel)
2020 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} )
2121endmacro ()
2222
23+ macro (bazel_even_if_failing)
24+ execute_process (COMMAND ${BAZEL_BIN} ${ARGN}
25+ OUTPUT_STRIP_TRAILING_WHITESPACE
26+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} )
27+ endmacro ()
28+
2329bazel(info workspace OUTPUT_VARIABLE BAZEL_WORKSPACE)
2430
2531bazel(info output_base OUTPUT_VARIABLE BAZEL_OUTPUT_BASE)
@@ -37,7 +43,7 @@ endmacro()
3743macro (generate_and_include)
3844 file (REMOVE "${BAZEL_WORKSPACE} /.bazel-cmake/BUILD.bazel" )
3945 # use aquery to only get targets compatible with the current platform
40- bazel (aquery "kind(\" cc_test|cc_binary\" , ${ARGN} )" --nocheck_visibility --output =jsonproto OUTPUT_VARIABLE BAZEL_AQUERY_RESULT)
46+ bazel_even_if_failing (aquery "kind(\" cc_test|cc_binary\" , ${ARGN} )" --nocheck_visibility --keep_going --output =jsonproto OUTPUT_VARIABLE BAZEL_AQUERY_RESULT)
4147 string (JSON BAZEL_JSON_TARGETS GET "${BAZEL_AQUERY_RESULT} " targets)
4248 string (JSON LAST_IDX LENGTH "${BAZEL_JSON_TARGETS} " )
4349 math (EXPR LAST_IDX "${LAST_IDX} - 1" )
@@ -48,7 +54,7 @@ macro(generate_and_include)
4854 file (WRITE "${BAZEL_WORKSPACE} /.bazel-cmake/BUILD.bazel" "\
4955# this file was generated by cmake
5056load('@${CODEQL_BAZEL_WORKSPACE} //misc/bazel/cmake:cmake.bzl', 'generate_cmake')\n\
51-
57+ \n\
5258generate_cmake(\n\
5359 name = 'cmake',\n\
5460 testonly = True,\n\
0 commit comments