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.

Sign up for GitHub

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

Jump to bottom

Bazel build fixes. #1836

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −8
Open

Bazel build fixes. #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ cc_library(
"//conditions:default": [],
}),
includes = [
"src/lib",
"src/lib/Iex",
"src/lib/OpenEXR",
"src/lib/OpenEXRCore",
Expand Down Expand Up @@ -157,6 +158,7 @@ cc_library(
"//conditions:default": [],
}),
includes = [
"src/lib",
"src/lib/IlmThread",
"src/lib/OpenEXRCore",
],
Expand All @@ -179,6 +181,7 @@ cc_library(
"src/lib/OpenEXRCore/context.c",
"src/lib/OpenEXRCore/debug.c",
"src/lib/OpenEXRCore/decoding.c",
"src/lib/OpenEXRCore/dwaLookups.h",
"src/lib/OpenEXRCore/encoding.c",
"src/lib/OpenEXRCore/float_vector.c",
"src/lib/OpenEXRCore/internal_attr.h",
Expand All @@ -198,7 +201,6 @@ cc_library(
"src/lib/OpenEXRCore/internal_dwa_encoder.h",
"src/lib/OpenEXRCore/internal_dwa_helpers.h",
"src/lib/OpenEXRCore/internal_dwa_simd.h",
"src/lib/OpenEXRCore/dwaLookups.h",
"src/lib/OpenEXRCore/internal_file.h",
"src/lib/OpenEXRCore/internal_float_vector.h",
"src/lib/OpenEXRCore/internal_huf.c",
Expand Down Expand Up @@ -273,7 +275,7 @@ cc_library(
}),
visibility = ["//visibility:public"],
deps = [
"@imath//:Imath",
"@imath",
"@libdeflate//:deflate",
],
)
Expand All @@ -294,9 +296,9 @@ cc_library(
"src/lib/OpenEXR/ImfCompression.cpp",
"src/lib/OpenEXR/ImfCompressionAttribute.cpp",
"src/lib/OpenEXR/ImfCompressor.cpp",
"src/lib/OpenEXR/ImfConvert.cpp",
"src/lib/OpenEXR/ImfContext.cpp",
"src/lib/OpenEXR/ImfContextInit.cpp",
"src/lib/OpenEXR/ImfConvert.cpp",
"src/lib/OpenEXR/ImfDeepCompositing.cpp",
"src/lib/OpenEXR/ImfDeepFrameBuffer.cpp",
"src/lib/OpenEXR/ImfDeepImageStateAttribute.cpp",
Expand Down Expand Up @@ -509,7 +511,10 @@ cc_library(
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
}),
includes = ["src/lib/OpenEXR"],
includes = [
"src/lib",
"src/lib/OpenEXR",
],
linkopts =
select({
":windows": [],
Expand All @@ -521,7 +526,7 @@ cc_library(
deps = [
":IlmThread",
":OpenEXRCore",
"@imath//:Imath",
"@imath",
],
)

Expand Down
6 changes: 3 additions & 3 deletions cmake/OpenEXRConfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
//

#ifndef INCLUDED_OPENEXR_VERSION_H
#define OPENEXR_VERSION_MAJOR @OpenEXR_VERSION_MAJOR@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious what prompted this change? It should be benign, as I believe OPENEXR_VERSION_* and OpenEXR_VERSION_* have the same values. Not opposed to it, just wondering why it should change.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When migrating to bazel we take and make bazel versions of these macros, and having them all consistently upper case seams cleaner for these kinds of external automation.

#define OPENEXR_VERSION_MINOR @OpenEXR_VERSION_MINOR@
#define OPENEXR_VERSION_PATCH @OpenEXR_VERSION_PATCH@
#define OPENEXR_VERSION_MAJOR @OPENEXR_VERSION_MAJOR@
#define OPENEXR_VERSION_MINOR @OPENEXR_VERSION_MINOR@
#define OPENEXR_VERSION_PATCH @OPENEXR_VERSION_PATCH@
#endif

//
Expand Down
Loading