aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrits Talbot <frits@metapathy.com>2019-06-11 01:32:10 +0200
committerRobert Schumacher <roschuma@microsoft.com>2019-06-10 16:32:10 -0700
commit06d5d393b962604ae0a0f8fa6cfd1a89d0627e83 (patch)
treea9143af3ff7d43dd4a6d3e6a73c99cdce6aea68d
parent5b35f447c7945e1e41a53a5c9a72c87d0d7f2b93 (diff)
downloadvcpkg-06d5d393b962604ae0a0f8fa6cfd1a89d0627e83.tar.gz
vcpkg-06d5d393b962604ae0a0f8fa6cfd1a89d0627e83.zip
[libraw] Add include for select_library_configurations (#6715) (#6742)
-rw-r--r--ports/libraw/CONTROL2
-rw-r--r--ports/libraw/findlibraw_debug_fix.patch6
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL
index 6b27ce223..1a13a37d9 100644
--- a/ports/libraw/CONTROL
+++ b/ports/libraw/CONTROL
@@ -1,4 +1,4 @@
Source: libraw
-Version: 201903
+Version: 201903-1
Build-Depends: lcms, jasper
Description: raw image decoder library
diff --git a/ports/libraw/findlibraw_debug_fix.patch b/ports/libraw/findlibraw_debug_fix.patch
index a09eca537..294963eb6 100644
--- a/ports/libraw/findlibraw_debug_fix.patch
+++ b/ports/libraw/findlibraw_debug_fix.patch
@@ -1,6 +1,6 @@
--- a/cmake/modules/FindLibRaw.cmake 2016-11-02 07:09:50.000000000 +0100
-+++ b/cmake/modules/FindLibRaw.cmake 2018-06-02 02:50:10.501142400 +0200
-@@ -31,18 +31,34 @@
++++ b/cmake/modules/FindLibRaw.cmake 2019-06-03 22:05:28.759307500 +0200
+@@ -31,18 +31,36 @@
PATH_SUFFIXES libraw
)
@@ -18,6 +18,8 @@
+ ${PC_LIBRAW_LIBRARY_DIRS}
+ )
+
++INCLUDE(SelectLibraryConfigurations)
++
+select_library_configurations(LibRaw)
+
+FIND_LIBRARY(LibRaw_r_LIBRARY_RELEASE NAMES raw_r