diff options
| author | trylle <github@metapathy.com> | 2018-08-08 07:50:51 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-07 22:50:51 -0700 |
| commit | b286cd50ddefb3d9457e261bf6518b1a46f4a830 (patch) | |
| tree | d0e79bdd33bbac7efe84fa47ed0450589246343b /ports/libraw/findlibraw_debug_fix.patch | |
| parent | 6d4223fedfe4483af56c71c6f4a4a94dbe4f0be5 (diff) | |
| download | vcpkg-b286cd50ddefb3d9457e261bf6518b1a46f4a830.tar.gz vcpkg-b286cd50ddefb3d9457e261bf6518b1a46f4a830.zip | |
Freeimage/libraw/lcms debug build fixes (#3643)
* Patch libraw-local FindLCMS2.cmake to handle debug postfix
* Remove library statement from def as name is incorrect for debug builds
https://msdn.microsoft.com/en-us/library/d91k01sh.aspx claims it is
required, but works fine (better) without.
* Patch FindLibRaw.cmake to handle debug postfix
* [lcms] Use vcpkg_from_github()'s PATCHES parameter
Diffstat (limited to 'ports/libraw/findlibraw_debug_fix.patch')
| -rw-r--r-- | ports/libraw/findlibraw_debug_fix.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/ports/libraw/findlibraw_debug_fix.patch b/ports/libraw/findlibraw_debug_fix.patch new file mode 100644 index 000000000..a09eca537 --- /dev/null +++ b/ports/libraw/findlibraw_debug_fix.patch @@ -0,0 +1,39 @@ +--- 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 @@ + PATH_SUFFIXES libraw + ) + +-FIND_LIBRARY(LibRaw_LIBRARIES NAMES raw ++FIND_LIBRARY(LibRaw_LIBRARY_RELEASE NAMES raw + HINTS + ${PC_LIBRAW_LIBDIR} + ${PC_LIBRAW_LIBRARY_DIRS} + ) + +-FIND_LIBRARY(LibRaw_r_LIBRARIES NAMES raw_r ++FIND_LIBRARY(LibRaw_LIBRARY_DEBUG NAMES rawd ++ HINTS ++ ${PC_LIBRAW_LIBDIR} ++ ${PC_LIBRAW_LIBRARY_DIRS} ++ ) ++ ++select_library_configurations(LibRaw) ++ ++FIND_LIBRARY(LibRaw_r_LIBRARY_RELEASE NAMES raw_r + HINTS + ${PC_LIBRAW_R_LIBDIR} + ${PC_LIBRAW_R_LIBRARY_DIRS} + ) + ++FIND_LIBRARY(LibRaw_r_LIBRARY_DEBUG NAMES raw_rd ++ HINTS ++ ${PC_LIBRAW_R_LIBDIR} ++ ${PC_LIBRAW_R_LIBRARY_DIRS} ++ ) ++ ++select_library_configurations(LibRaw_r) ++ + IF(LibRaw_INCLUDE_DIR) + FILE(READ ${LibRaw_INCLUDE_DIR}/libraw_version.h _libraw_version_content) + |