mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 10:49:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9255 from LaurensVoerman/OpenEXRfix

Browse Source 
[OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES
This commit is contained in:
dan-shaw 2019-12-20 12:11:03 -08:00 committed by GitHub
commit 5cb3f294d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/alembic/CONTROL
View File

@ -1,5 +1,5 @@
Source: alembic Source: alembic
Version: 1.7.11-5 Version: 1.7.11-6
Build-Depends: ilmbase, hdf5 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. 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/ Homepage: https://alembic.io/

14
ports/alembic/fix-find-openexr-ilmbase.patch
View File

@ -1,5 +1,5 @@
diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
index cd00d70..a73c8db 100644 index cd00d70..0e50512 100644
--- a/cmake/AlembicIlmBase.cmake --- a/cmake/AlembicIlmBase.cmake
+++ b/cmake/AlembicIlmBase.cmake +++ b/cmake/AlembicIlmBase.cmake
@@ -33,11 +33,25 @@ @@ -33,11 +33,25 @@
@ -30,6 +30,18 @@ index cd00d70..a73c8db 100644
SET(ALEMBIC_ILMBASE_LIBS SET(ALEMBIC_ILMBASE_LIBS
${ALEMBIC_ILMBASE_IMATH_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB}
${ALEMBIC_ILMBASE_ILMTHREAD_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 diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake
index 0833b32..a9180cd 100644 index 0833b32..a9180cd 100644
--- a/cmake/AlembicOpenEXR.cmake --- a/cmake/AlembicOpenEXR.cmake

2
ports/openexr/CONTROL
View File

@ -1,5 +1,5 @@
Source: openexr Source: openexr
Version: 2.3.0-4 Version: 2.3.0-5
Homepage: https://www.openexr.com/ 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 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 Build-Depends: zlib

2
ports/openexr/FindOpenEXR.cmake
View File

@ -49,7 +49,7 @@ endif()
if(NOT OpenEXR_IEXMATH_LIBRARY) if(NOT OpenEXR_IEXMATH_LIBRARY)
find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX}) 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) select_library_configurations(OpenEXR_IEXMATH)
endif() endif()