Skip to content

Commit

Permalink
Bazel support: Support only Bzmlod and bump Imath version
Browse files Browse the repository at this point in the history
Signed-off-by: Vertexwahn <julian.amann@tum.de>
  • Loading branch information
Vertexwahn committed Mar 6, 2024
1 parent 2a579fd commit 1900d34
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 193 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/bazel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ jobs:
run: |
bazelisk build //...
bazelisk test //...
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
build_and_test_windows:
name: Windows Server 2022 build <Visual Studio 2022>
Expand All @@ -78,9 +75,6 @@ jobs:
run: |
bazelisk build //...
bazelisk test //...
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
build_and_test_macos:
name: macOS 13 Bazel build <Apple Clang14>
Expand All @@ -99,9 +93,6 @@ jobs:
run: |
bazelisk build //...
bazelisk test //...
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
build_and_test_macos_M1:
name: macOS 14 Bazel build <Apple Clang14>
Expand All @@ -120,6 +111,3 @@ jobs:
run: |
bazelisk build //...
bazelisk test //...
# Test without bzlmod
bazelisk build --noenable_bzlmod -- //...
bazelisk test --noenable_bzlmod -- //...
4 changes: 2 additions & 2 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ cc_library(
}),
visibility = ["//visibility:public"],
deps = [
"@Imath",
"@imath//:Imath",
"@libdeflate//:deflate",
],
)
Expand Down Expand Up @@ -501,7 +501,7 @@ cc_library(
deps = [
":IlmThread",
":OpenEXRCore",
"@Imath",
"@imath//:Imath",
],
)

Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ module(
)

bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "imath", version = "3.1.10", repo_name = "Imath")
bazel_dep(name = "imath", version = "3.1.11")
bazel_dep(name = "libdeflate", version = "1.19")
bazel_dep(name = "platforms", version = "0.0.8")
10 changes: 1 addition & 9 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

workspace(name = "com_openexr")

load("//:bazel/third_party/openexr_deps.bzl", "openexr_deps")

openexr_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
# WORKSPACE marker file needed by Bazel
76 changes: 0 additions & 76 deletions bazel/third_party/Imath.BUILD

This file was deleted.

55 changes: 0 additions & 55 deletions bazel/third_party/libdeflate.BUILD

This file was deleted.

38 changes: 0 additions & 38 deletions bazel/third_party/openexr_deps.bzl

This file was deleted.

0 comments on commit 1900d34

Please sign in to comment.