Skip to content

Commit be1d0db

Browse files
committed
testing, docs: guard test env-var set_property, rename legacy ref, fix docs indent
- Added a guard in testing.cmake before setting the `OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT` env variable property for the `openexr-compression` test. To fix openImageIO from not being able to configure and build when the `BUILD_TESTING`, `OIIO_BUILD_TESTS` flag options were not set to `ON`. Signed-off-by: Abhirup Bhattacharyya <abhirup27022001@outlook.com>
1 parent 6eb7e50 commit be1d0db

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎src/cmake/testing.cmake‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,14 @@ macro (oiio_add_all_tests)
473473
# New compression tests of zstd and lj2k require OpenEXR main branch,
474474
# or latest release or at least V3.5.0
475475
if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.5.0)
476-
set_property (TEST openexr-compression APPEND PROPERTY ENVIRONMENT
477-
"OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
478-
set_property (TEST openexr-compression.core APPEND PROPERTY ENVIRONMENT
479-
"OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
476+
if (TEST openexr-compression)
477+
set_property (TEST openexr-compression APPEND PROPERTY ENVIRONMENT
478+
"OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
479+
endif ()
480+
if (TEST openexr-compression.core)
481+
set_property (TEST openexr-compression.core APPEND PROPERTY
482+
ENVIRONMENT "OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
483+
endif ()
480484
endif ()
481485

482486
# Regression test (compiles its own helper and generates its own image)

‎src/doc/builtinplugins.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ The official OpenEXR site is <http://www.openexr.com/>.
16121612
* - ``FNumber``
16131613
- float
16141614
- aperture
1615-
* - ``compression``
1615+
* - ``compression``
16161616
- string
16171617
- one of: ``"none"``, ``"rle"``, ``"zip"``, ``"zips"``, ``"piz"``,
16181618
``"pxr24"``, ``"b44"``, ``"b44a"``, ``"dwaa"``, ``"dwab"``,
File renamed without changes.

0 commit comments

Comments
 (0)