diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-09-19 03:55:32 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-09-18 12:55:32 -0700 |
| commit | 44de09ff5e63ddf20b83b6d9e51638a384957cab (patch) | |
| tree | 2b2daf0b98682936e7f7e1032d4adc883e380b78 | |
| parent | 095b4a2647f05f701ed50e350eb208e6055a2f1b (diff) | |
| download | vcpkg-44de09ff5e63ddf20b83b6d9e51638a384957cab.tar.gz vcpkg-44de09ff5e63ddf20b83b6d9e51638a384957cab.zip | |
[openimageio] Fix debug suffix issue. (#8230)
| -rw-r--r-- | ports/openimageio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openimageio/fix_find_openexr.patch | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 4ef37065a..70b2e528f 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,5 @@ Source: openimageio -Version: 2019-08-08-3 +Version: 2019-08-08-4 Homepage: https://github.com/OpenImageIO/oiio Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace diff --git a/ports/openimageio/fix_find_openexr.patch b/ports/openimageio/fix_find_openexr.patch index a2014f3d8..f9bc401d9 100644 --- a/ports/openimageio/fix_find_openexr.patch +++ b/ports/openimageio/fix_find_openexr.patch @@ -1,8 +1,8 @@ diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake -index babfffd..8e79925 100644 +index babfffd..3d0bee3 100644 --- a/src/cmake/modules/FindOpenEXR.cmake +++ b/src/cmake/modules/FindOpenEXR.cmake -@@ -118,24 +118,25 @@ endif () +@@ -118,24 +118,30 @@ endif () # headers, we do two finds -- first for custom locations, then for default. # This is complicated because the OpenEXR libraries may or may not be # built with version numbers embedded. @@ -24,24 +24,29 @@ index babfffd..8e79925 100644 - # One more time, with no restrictions - find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}) -endforeach () ++if (WIN32) ++ set(OPENEXR_DEBUG_SUFFIX "_d") ++else() ++ set(OPENEXR_DEBUG_SUFFIX "") ++endif() +find_library(ILMTHREAD_LIBRARY_RELEASE NAMES IlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) -+find_library(ILMTHREAD_LIBRARY_DEBUG NAMES IlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d) ++find_library(ILMTHREAD_LIBRARY_DEBUG NAMES IlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_DEBUG_SUFFIX}) +select_library_configurations(ILMTHREAD) + +find_library(OPENEXR_ILMIMF_LIBRARY_RELEASE NAMES IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) -+find_library(OPENEXR_ILMIMF_LIBRARY_DEBUG NAMES IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d) ++find_library(OPENEXR_ILMIMF_LIBRARY_DEBUG NAMES IlmImf-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_DEBUG_SUFFIX}) +select_library_configurations(OPENEXR_ILMIMF) + +find_library(OPENEXR_IMATH_LIBRARY_RELEASE NAMES Imath-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) -+find_library(OPENEXR_IMATH_LIBRARY_DEBUG NAMES Imath-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d) ++find_library(OPENEXR_IMATH_LIBRARY_DEBUG NAMES Imath-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_DEBUG_SUFFIX}) +select_library_configurations(OPENEXR_IMATH) + +find_library(OPENEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) -+find_library(OPENEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d) ++find_library(OPENEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_DEBUG_SUFFIX}) +select_library_configurations(OPENEXR_IEX) + +find_library(OPENEXR_HALF_LIBRARY_RELEASE NAMES Half-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) -+find_library(OPENEXR_HALF_LIBRARY_DEBUG NAMES Half-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d) ++find_library(OPENEXR_HALF_LIBRARY_DEBUG NAMES Half-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_DEBUG_SUFFIX}) +select_library_configurations(OPENEXR_HALF) # Set the FOUND, INCLUDE_DIR, and LIBRARIES variables. |