diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-06 15:06:28 -0800 |
| commit | 7347305e8459fcc78553a9f88196e0d93eb0a8fe (patch) | |
| tree | ac9eee9ff267c6a71a83249bed7a94f02b00d9a5 /ports/openimageio/fix_libraw.patch | |
| parent | ed9357a5aafea7192932b5874264bd103fc61255 (diff) | |
| parent | 63c1b2628e958f8e02356411f032941c0c2f3bbb (diff) | |
| download | vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.tar.gz vcpkg-7347305e8459fcc78553a9f88196e0d93eb0a8fe.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
Diffstat (limited to 'ports/openimageio/fix_libraw.patch')
| -rw-r--r-- | ports/openimageio/fix_libraw.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/ports/openimageio/fix_libraw.patch b/ports/openimageio/fix_libraw.patch new file mode 100644 index 000000000..0870a567f --- /dev/null +++ b/ports/openimageio/fix_libraw.patch @@ -0,0 +1,40 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 5eeb7d3..3e8bfcb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -336,7 +336,7 @@ if (USE_LIBRAW) + message (STATUS "Looking for LibRaw with ${LIBRAW_PATH}") + endif () + find_package (LibRaw) +- if (LibRaw_r_LIBRARIES AND LibRaw_INCLUDE_DIR) ++ if (LibRaw_LIBRARIES AND LibRaw_INCLUDE_DIR) + set (LIBRAW_FOUND TRUE) + include_directories (${LibRaw_INCLUDE_DIR}) + if (NOT LibRaw_FIND_QUIETLY) +@@ -350,7 +350,7 @@ if (USE_LIBRAW) + if (LINKSTATIC) + find_package (Jasper) + find_library (LCMS2_LIBRARIES NAMES lcms2) +- set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES}) ++ set (LibRaw_LIBRARIES ${LibRaw_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES}) + endif () + else () + message (STATUS "Not using LibRaw") +@@ -494,4 +494,3 @@ if (USE_DICOM) + endif() + # end DCMTK setup + ########################################################################### +- +diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt +index e3608a2..f503035 100644 +--- a/src/raw.imageio/CMakeLists.txt ++++ b/src/raw.imageio/CMakeLists.txt +@@ -1,7 +1,7 @@ + if (USE_LIBRAW AND LIBRAW_FOUND) + add_oiio_plugin (rawinput.cpp + INCLUDE_DIRS ${LibRaw_INCLUDE_DIR} +- LINK_LIBRARIES ${LibRaw_r_LIBRARIES} ++ LINK_LIBRARIES ${LibRaw_LIBRARIES} + DEFINITIONS "-DUSE_LIBRAW=1") + else () + message (WARNING "Raw plugin will not be built") |