-
Notifications
You must be signed in to change notification settings - Fork 445
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Simplify Bazel #312
Merged
Merged
Simplify Bazel #312
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,25 @@ | ||
load("@rules_cc//cc:defs.bzl", "cc_test") | ||
load("@magic_enum//bazel:copts.bzl", "COPTS") | ||
|
||
# bazel central registry has a catch2 module, but is newer than the one included | ||
# in this repository | ||
cc_library( | ||
name = "catch2", | ||
includes = ["3rdparty/Catch2/include"], | ||
hdrs = ["3rdparty/Catch2/include/catch2/catch.hpp"], | ||
copts = COPTS, | ||
) | ||
|
||
_TESTS = [ | ||
"test", | ||
"test_flags", | ||
] | ||
|
||
_MSVC_FLAGS = ["/std:c++17", "/permissive-"] | ||
_COPTS = select({ | ||
"//conditions:default": ["-std=c++17"], | ||
"@rules_cc//cc/compiler:msvc-cl": _MSVC_FLAGS, | ||
"@rules_cc//cc/compiler:clang-cl": _MSVC_FLAGS, | ||
}) | ||
[cc_test( | ||
name = test, | ||
srcs = ["{}.cpp".format(test)], | ||
deps = ["@magic_enum", ":catch2"], | ||
copts = COPTS, | ||
copts = _COPTS, | ||
) for test in _TESTS] | ||
|
||
# bazel central registry has a catch2 module, but is newer than the one included | ||
# in this repository | ||
cc_library( | ||
name = "catch2", | ||
includes = ["3rdparty/Catch2/include"], | ||
hdrs = ["3rdparty/Catch2/include/catch2/catch.hpp"], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
module(name = "magic_enum_tests") | ||
|
||
bazel_dep(name = "magic_enum") | ||
bazel_dep(name = "rules_cc", version = "0.0.8") | ||
|
||
local_path_override(module_name = "magic_enum", path = "..") | ||
|
||
bazel_dep(name = "rules_cc", version = "0.0.8") | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: maybe put the bazel dep back up top? :P
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd reordered intentionally, thinking we might want the magic-enum dependency configuration all together for clarity that it's being overridden and quick-skimmability.
But I don't feel super strongly or anything--feel free to change if you feel strongly the other way? Or generally lmk if you think there's a different principle I should be absorbing here.
(I'm assuming from the approval that you don't want to block merging on this, yeah? Still v interested in what you have to say, ofc.)