Skip to content

Commit 7899cfb

Browse files
committed
Further tweaks to install and bazel
1 parent 3384225 commit 7899cfb

File tree

7 files changed

+22
-1
lines changed

7 files changed

+22
-1
lines changed

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ cc_library(
266266
visibility = ["//visibility:public"],
267267
deps = [
268268
"@imath",
269+
"@openjph",
269270
"@libdeflate//:deflate",
270271
],
271272
)
@@ -508,6 +509,7 @@ cc_library(
508509
":IlmThread",
509510
":OpenEXRCore",
510511
"@imath",
512+
"@openjph"
511513
],
512514
)
513515

MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module(
88

99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "imath")
11+
bazel_dep(name = "openjph")
1112
bazel_dep(name = "libdeflate")
1213
bazel_dep(name = "platforms", version = "0.0.10")
1314

@@ -30,3 +31,9 @@ archive_override(
3031
strip_prefix = "libdeflate-master",
3132
urls = ["https://github.com/ebiggers/libdeflate/archive/refs/heads/master.zip"],
3233
)
34+
35+
git_override(
36+
module_name = "openjph",
37+
commit = "7a2f6ea63be48729379659933e0db33edcce87a9",
38+
remote = "https://github.com/aous72/OpenJPH.git",
39+
)

share/ci/install_manifest/install_manifest.windows.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ bin/Imath-3_2.dll
55
bin/OpenEXR-$MAJOR_$MINOR.dll
66
bin/OpenEXRCore-$MAJOR_$MINOR.dll
77
bin/OpenEXRUtil-$MAJOR_$MINOR.dll
8+
bin/openjph.0.18.dll
89
bin/exr2aces.exe
910
bin/exrenvmap.exe
1011
bin/exrheader.exe
@@ -225,7 +226,6 @@ lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
225226
lib/cmake/OpenEXR/OpenEXRTargets.cmake
226227
lib/pkgconfig/Imath.pc
227228
lib/pkgconfig/OpenEXR.pc
228-
bin/openjph.0.18.dll
229229
lib/openjph.0.18.lib
230230
lib/pkgconfig/openjph.pc
231231
share/doc/OpenEXR/examples/deepExamples.cpp

share/ci/install_manifest/install_manifest.windows.2.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ bin/Imath-3_2_d.dll
55
bin/OpenEXR-$MAJOR_$MINOR_d.dll
66
bin/OpenEXRCore-$MAJOR_$MINOR_d.dll
77
bin/OpenEXRUtil-$MAJOR_$MINOR_d.dll
8+
bin/openjph.0.18.dll
89
bin/exr2aces.exe
910
bin/exrenvmap.exe
1011
bin/exrheader.exe
@@ -225,6 +226,8 @@ lib/cmake/OpenEXR/OpenEXRTargets-debug.cmake
225226
lib/cmake/OpenEXR/OpenEXRTargets.cmake
226227
lib/pkgconfig/Imath.pc
227228
lib/pkgconfig/OpenEXR.pc
229+
lib/openjph.0.18.lib
230+
lib/pkgconfig/openjph.pc
228231
share/doc/OpenEXR/examples/deepExamples.cpp
229232
share/doc/OpenEXR/examples/deepExamples.h
230233
share/doc/OpenEXR/examples/deepTiledExamples.cpp

share/ci/install_manifest/install_manifest.windows.4.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ bin/Imath-3_2.dll
55
bin/OpenEXR-$MAJOR_$MINOR.dll
66
bin/OpenEXRCore-$MAJOR_$MINOR.dll
77
bin/OpenEXRUtil-$MAJOR_$MINOR.dll
8+
bin/openjph.0.18.dll
89
bin/exr2aces.exe
910
bin/exrenvmap.exe
1011
bin/exrheader.exe
@@ -225,6 +226,8 @@ lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
225226
lib/cmake/OpenEXR/OpenEXRTargets.cmake
226227
lib/pkgconfig/Imath.pc
227228
lib/pkgconfig/OpenEXR.pc
229+
lib/openjph.0.18.lib
230+
lib/pkgconfig/openjph.pc
228231
share/doc/OpenEXR/examples/deepExamples.cpp
229232
share/doc/OpenEXR/examples/deepExamples.h
230233
share/doc/OpenEXR/examples/deepTiledExamples.cpp

share/ci/install_manifest/install_manifest.windows.5.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ bin/Imath-3_2.dll
55
bin/OpenEXR-$MAJOR_$MINOR.dll
66
bin/OpenEXRCore-$MAJOR_$MINOR.dll
77
bin/OpenEXRUtil-$MAJOR_$MINOR.dll
8+
bin/openjph.0.18.dll
89
include/Imath/ImathBox.h
910
include/Imath/ImathBoxAlgo.h
1011
include/Imath/ImathColor.h
@@ -213,3 +214,5 @@ lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
213214
lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
214215
lib/cmake/OpenEXR/OpenEXRTargets.cmake
215216
lib/pkgconfig/Imath.pc
217+
lib/openjph.0.18.lib
218+
lib/pkgconfig/openjph.pc

share/ci/install_manifest/install_manifest.windows.6.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ bin/Imath-3_2.dll
55
bin/OpenEXR-$MAJOR_$MINOR.dll
66
bin/OpenEXRCore-$MAJOR_$MINOR.dll
77
bin/OpenEXRUtil-$MAJOR_$MINOR.dll
8+
bin/openjph.0.18.dll
89
bin/exr2aces.exe
910
bin/exrenvmap.exe
1011
bin/exrheader.exe
@@ -225,6 +226,8 @@ lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
225226
lib/cmake/OpenEXR/OpenEXRTargets.cmake
226227
lib/pkgconfig/Imath.pc
227228
lib/pkgconfig/OpenEXR.pc
229+
lib/openjph.0.18.lib
230+
lib/pkgconfig/openjph.pc
228231
share/doc/OpenEXR/examples/deepExamples.cpp
229232
share/doc/OpenEXR/examples/deepExamples.h
230233
share/doc/OpenEXR/examples/deepTiledExamples.cpp

0 commit comments

Comments
 (0)