From 9d3a0e04da8191e0adbdb3b84a9836382533938f Mon Sep 17 00:00:00 2001 From: asa Date: Fri, 20 Sep 2024 19:50:10 -0700 Subject: [PATCH] Bazel build fixes. Signed-off-by: asa --- BUILD.bazel | 15 ++++++++++----- cmake/OpenEXRConfig.h.in | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 8501050258..1721c68a7e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -116,6 +116,7 @@ cc_library( "//conditions:default": [], }), includes = [ + "src/lib", "src/lib/Iex", "src/lib/OpenEXR", "src/lib/OpenEXRCore", @@ -157,6 +158,7 @@ cc_library( "//conditions:default": [], }), includes = [ + "src/lib", "src/lib/IlmThread", "src/lib/OpenEXRCore", ], @@ -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", @@ -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", @@ -273,7 +275,7 @@ cc_library( }), visibility = ["//visibility:public"], deps = [ - "@imath//:Imath", + "@imath", "@libdeflate//:deflate", ], ) @@ -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", @@ -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": [], @@ -521,7 +526,7 @@ cc_library( deps = [ ":IlmThread", ":OpenEXRCore", - "@imath//:Imath", + "@imath", ], ) diff --git a/cmake/OpenEXRConfig.h.in b/cmake/OpenEXRConfig.h.in index 403c9d6a26..196a6336ed 100644 --- a/cmake/OpenEXRConfig.h.in +++ b/cmake/OpenEXRConfig.h.in @@ -17,9 +17,9 @@ // #ifndef INCLUDED_OPENEXR_VERSION_H -#define OPENEXR_VERSION_MAJOR @OpenEXR_VERSION_MAJOR@ -#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 //