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/lcms | |
| 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/lcms')
| -rw-r--r-- | ports/lcms/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lcms/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/lcms/remove_library_directive.patch | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL index 5855fbc71..fd9c9d429 100644 --- a/ports/lcms/CONTROL +++ b/ports/lcms/CONTROL @@ -1,4 +1,4 @@ Source: lcms -Version: 2.8-4 +Version: 2.8-5 Build-Depends: Description: Little CMS. diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 7d52e5270..4e125fa86 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -5,7 +5,8 @@ vcpkg_from_github( REPO mm2/Little-CMS REF lcms2.8 SHA512 22ee94aa3333db4248607d8aa84343d324e04b30c154c46672c6f668e14a369b9b72f2557b8465218b6e9a2676cf8fa37d617b4aa13a013dc2337197a599e63a - HEAD_REF master + HEAD_REF master + PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove_library_directive.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/lcms/remove_library_directive.patch b/ports/lcms/remove_library_directive.patch new file mode 100644 index 000000000..29d035dc2 --- /dev/null +++ b/ports/lcms/remove_library_directive.patch @@ -0,0 +1,8 @@ +--- a/src/lcms2.def 2016-07-20 09:46:01.000000000 +0200
++++ b/src/lcms2.def 2018-06-02 02:11:04.135781600 +0200
+@@ -1,5 +1,3 @@
+-LIBRARY LCMS2.DLL
+-
+ EXPORTS
+
+ _cms15Fixed16toDouble = _cms15Fixed16toDouble
|