diff options
| author | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-20 12:11:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 12:11:03 -0800 |
| commit | 5cb3f294d5ab496f83daf04b62bc237e9e652e09 (patch) | |
| tree | 13da98826d079a4ec42139987f4c7b2f948c3e9a | |
| parent | 35f9e6ea94dfae1145ecabf4bbceb54e50bc8a55 (diff) | |
| parent | 23104e2aa49ce85e5d24c27760dadafef048f930 (diff) | |
| download | vcpkg-5cb3f294d5ab496f83daf04b62bc237e9e652e09.tar.gz vcpkg-5cb3f294d5ab496f83daf04b62bc237e9e652e09.zip | |
Merge pull request #9255 from LaurensVoerman/OpenEXRfix
[OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES
| -rw-r--r-- | ports/alembic/CONTROL | 2 | ||||
| -rw-r--r-- | ports/alembic/fix-find-openexr-ilmbase.patch | 14 | ||||
| -rw-r--r-- | ports/openexr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openexr/FindOpenEXR.cmake | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index e95c999d7..5d9e05635 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,5 +1,5 @@ Source: alembic -Version: 1.7.11-5 +Version: 1.7.11-6 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ diff --git a/ports/alembic/fix-find-openexr-ilmbase.patch b/ports/alembic/fix-find-openexr-ilmbase.patch index fdd24249a..6a72711f4 100644 --- a/ports/alembic/fix-find-openexr-ilmbase.patch +++ b/ports/alembic/fix-find-openexr-ilmbase.patch @@ -1,5 +1,5 @@ diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake -index cd00d70..a73c8db 100644 +index cd00d70..0e50512 100644 --- a/cmake/AlembicIlmBase.cmake +++ b/cmake/AlembicIlmBase.cmake @@ -33,11 +33,25 @@ @@ -30,6 +30,18 @@ index cd00d70..a73c8db 100644 SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_IMATH_LIB} ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} +@@ -45,9 +59,9 @@ IF (ILMBASE_FOUND) + ${ALEMBIC_ILMBASE_HALF_LIB} + ) + +- if (${ALEMBIC_ILMBASE_IEXMATH_LIB}) ++ if (ALEMBIC_ILMBASE_IEXMATH_LIB) + SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB}) +- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB}) ++ endif (ALEMBIC_ILMBASE_IEXMATH_LIB) + + ELSE() + SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake index 0833b32..a9180cd 100644 --- a/cmake/AlembicOpenEXR.cmake diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index 5fc8b52d6..7d8759237 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,5 +1,5 @@ Source: openexr -Version: 2.3.0-4 +Version: 2.3.0-5 Homepage: https://www.openexr.com/ Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Build-Depends: zlib diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake index 4b5b280a0..f036c742e 100644 --- a/ports/openexr/FindOpenEXR.cmake +++ b/ports/openexr/FindOpenEXR.cmake @@ -49,7 +49,7 @@ endif() if(NOT OpenEXR_IEXMATH_LIBRARY) find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX}) - find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}d) + find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}_d) select_library_configurations(OpenEXR_IEXMATH) endif() |