Skip to content

Commit

Permalink
Merge pull request #13 from theteamatx/feature/remove_submodule_signed
Browse files Browse the repository at this point in the history
Rewired genit dependency to public release, removed submodule
  • Loading branch information
mikael-s-persson authored Oct 9, 2023
2 parents fe806cd + d3eb883 commit 73660d4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 16 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "third_party/x-edr-genit"]
path = third_party/x-edr-genit
url = https://github.com/theteamatx/x-edr-genit.git
20 changes: 10 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ http_archive(
http_archive(
name = "eigen",
build_file = "//third_party:eigen.BUILD",
sha256 = "8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72",
url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz",
strip_prefix="eigen-3.4.0",
)
Expand Down Expand Up @@ -53,14 +54,13 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

#git_repository(
# name = "genit",
# remote = "https://github.com/theteamatx/x-edr-genit.git",
# branch = "main"
#)

local_repository(
name = "genit",
path = "third_party/x-edr-genit",
# GenIt
_GENIT_VERSION = "1.0.0"
http_archive(
name = "x_edr_genit",
sha256 = "ab1bbb15ecbe86c5c3888a12c56fe88fac416f2f305acaf1bbf7f68c3d429851",
strip_prefix = "x-edr-genit-%s" % _GENIT_VERSION,
urls = [
"https://github.com/theteamatx/x-edr-genit/archive/refs/tags/v%s.tar.gz" % _GENIT_VERSION,
],
)

4 changes: 2 additions & 2 deletions eigenmath/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ cc_library(
"@com_google_absl//absl/types:optional",
"@com_google_absl//absl/types:span",
"@eigen",
"@genit//genit:iterators",
"@x_edr_genit//genit:iterators",
],
)

Expand Down Expand Up @@ -132,7 +132,7 @@ cc_library(
":eigenmath",
"@com_google_googletest//:gtest",
"@eigen",
"@genit//genit:iterators",
"@x_edr_genit//genit:iterators",
],
)

Expand Down
1 change: 0 additions & 1 deletion third_party/x-edr-genit
Submodule x-edr-genit deleted from 542a05

0 comments on commit 73660d4

Please sign in to comment.