From 634cdb4efefcbd9ee8816e9507013f10de20a78d Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Fri, 11 Mar 2022 22:07:50 +0100 Subject: [PATCH] Fix borken Bazel build --- BUILD.bazel | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++--- WORKSPACE | 11 ++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 6dc626d8..9b7d608d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,14 +1,69 @@ # Load the cc_library rule. load("@rules_cc//cc:defs.bzl", "cc_library") +load("@bazel_skylib//rules:expand_template.bzl", "expand_template") + +expand_template( + name = "catch_user_config.hpp", + out = "catch2/catch_user_config.hpp", + substitutions = { + "#cmakedefine CATCH_CONFIG_ANDROID_LOGWRITE": "", + "#cmakedefine CATCH_CONFIG_COLOUR_ANSI": "", + "#cmakedefine CATCH_CONFIG_COLOUR_NONE": "", + "#cmakedefine CATCH_CONFIG_COLOUR_WINDOWS": "", + "#cmakedefine CATCH_CONFIG_COUNTER": "", + "#cmakedefine CATCH_CONFIG_CPP11_TO_STRING": "", + "#cmakedefine CATCH_CONFIG_CPP17_BYTE": "", + "#cmakedefine CATCH_CONFIG_CPP17_OPTIONAL": "", + "#cmakedefine CATCH_CONFIG_CPP17_STRING_VIEW": "", + "#cmakedefine CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS": "", + "#cmakedefine CATCH_CONFIG_CPP17_VARIANT": "", + "#cmakedefine CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER": "", + "#cmakedefine CATCH_CONFIG_DISABLE_EXCEPTIONS": "", + "#cmakedefine CATCH_CONFIG_DISABLE_STRINGIFICATION": "", + "#cmakedefine CATCH_CONFIG_DISABLE": "", + "#cmakedefine CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS": "", + "#cmakedefine CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER": "", + "#cmakedefine CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER": "", + "#cmakedefine CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER": "", + "#cmakedefine CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER": "", + "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_REDIRECT": "", + "#cmakedefine CATCH_CONFIG_FALLBACK_STRINGIFIER @CATCH_CONFIG_FALLBACK_STRINGIFIER@": "", + "#cmakedefine CATCH_CONFIG_FAST_COMPILE": "", + "#cmakedefine CATCH_CONFIG_GLOBAL_NEXTAFTER": "", + "#cmakedefine CATCH_CONFIG_NO_COUNTER": "", + "#cmakedefine CATCH_CONFIG_NO_CPP11_TO_STRING": "", + "#cmakedefine CATCH_CONFIG_NO_CPP17_BYTE": "", + "#cmakedefine CATCH_CONFIG_NO_CPP17_OPTIONAL": "", + "#cmakedefine CATCH_CONFIG_NO_CPP17_STRING_VIEW": "", + "#cmakedefine CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS": "", + "#cmakedefine CATCH_CONFIG_NO_CPP17_VARIANT": "", + "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "", + "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "", + "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "", + "#cmakedefine CATCH_CONFIG_NO_WCHAR": "", + "#cmakedefine CATCH_CONFIG_NO_WINDOWS_SEH": "", + "#cmakedefine CATCH_CONFIG_NOSTDOUT": "", + "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "", + "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "", + "#cmakedefine CATCH_CONFIG_USE_ASYNC": "", + "#cmakedefine CATCH_CONFIG_WCHAR": "", + "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "", + "#cmakedefine CATCH_CONFIG_WINDOWS_SEH": "", + "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "", + "@CATCH_CONFIG_DEFAULT_REPORTER@": "console", + "@CATCH_CONFIG_CONSOLE_WIDTH@": "80", + }, + template = "src/catch2/catch_user_config.hpp.in", +) + # Static library, without main. cc_library( name = "catch2", - hdrs = glob(["src/catch2/**/*.hpp"]), + hdrs = glob(["src/catch2/**/*.hpp"]) + ["catch_user_config.hpp"], srcs = glob(["src/catch2/**/*.cpp"], exclude=[ "src/catch2/internal/catch_main.cpp"]), visibility = ["//visibility:public"], - copts = ["-std=c++14"], linkstatic = True, includes = ["src/"], ) @@ -20,6 +75,5 @@ cc_library( deps = [":catch2"], visibility = ["//visibility:public"], linkstatic = True, - copts = ["-std=c++14"], includes = ["src/"], ) diff --git a/WORKSPACE b/WORKSPACE index e69de29b..bbe88bc2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -0,0 +1,11 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +http_archive( + name = "bazel_skylib", + urls = [ + "https://github.com/Vertexwahn/bazel-skylib/archive/b0cd4bbd4bf4af76c380e1f8fafdbe3964161aff.tar.gz", + ], + strip_prefix = "bazel-skylib-b0cd4bbd4bf4af76c380e1f8fafdbe3964161aff", + sha256 = "e57f3ff541c65678f3c2b344c73945531838e86ea0be71c63eea862ab43e792b", +) +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") +bazel_skylib_workspace()