Skip to content
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

Incorporate recent config changes into BUILD.bazel #936

Merged
merged 2 commits into from Feb 26, 2021

Conversation

cary-ilm
Copy link
Member

This removes "IlmBase" from BUILD.bazel, attempting to incorporate the recent changes that split IlmBaseConfig.h into IexConfig.h and IlmThreadConfig.h, and IlmBaseConfigInternal.h into IexConfigInternal.h.

But without knowledge of bazel, this is guesswork, but hopefully a reasonable start.

@Vertexwahn, can you take a look?

Signed-off-by: Cary Phillips cary@ilm.com

This removes "IlmBase" from BUILD.bazel, attempting to incorporate the
recnt changes that split IlmBaseConfig.h into IexConfig.h and
IlmThreadConfig.h, and IlmBaseConfigInternal.h into
IexConfigInternal.h.

But without knowledge of bazel, this is guesswork, but hopefully a
reasonable start.

Signed-off-by: Cary Phillips <cary@ilm.com>
@Vertexwahn
Copy link
Contributor

Vertexwahn commented Feb 25, 2021

Looks very good!

Please update also the openexr.bzl (in folder bazel/thirdparty) file accordingly:

# SPDX-License-Identifier: BSD-3-Clause
# Copyright Contributors to the OpenEXR Project.

"""External dependencies for openexr."""

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

def openexr_deps():
    # zlib
    maybe(
        http_archive,
        name = "zlib",
        build_file = "@openexr//:bazel/third_party/zlib.BUILD",
        sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
        strip_prefix = "zlib-1.2.11",
        urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
    )

    maybe(
        http_archive,
        name = "Imath",
        build_file = "@openexr//:bazel/third_party/Imath.BUILD",
        strip_prefix = "Imath-f21e31a85a4a0b4ddcd980a19e448fd7eca72cce",
        sha256 = "6943dce2b2e8737d7cf1ae58103195b64c51c6330237ec07c12d829745b4c9c0",
        urls = ["https://github.com/AcademySoftwareFoundation/Imath/archive/f21e31a85a4a0b4ddcd980a19e448fd7eca72cce.zip"],
    )

If you wound what I propose to change: I changed Imath to the newest commit hash

Signed-off-by: Cary Phillips <cary@ilm.com>
@cary-ilm cary-ilm merged commit 36a1cfa into AcademySoftwareFoundation:master Feb 26, 2021
@cary-ilm cary-ilm deleted the bazel-fixes branch May 18, 2021 03:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants