From 0b51f928db5b132b83fc926fb529e5a446819bca Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 9 Dec 2019 21:57:03 +0100 Subject: [PATCH] symbols only clash in static builds --- ports/libharu/portfile.cmake | 4 +++- ports/libharu/tiff.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 58b55a6fc..7a9f6891c 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,5 +1,7 @@ if("notiffsymbols" IN_LIST FEATURES) - set(DISABLETIFF tiff.patch) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(DISABLETIFF tiff.patch) + endif() endif() vcpkg_download_distfile(SHADING_PR URLS "https://github.com/libharu/libharu/pull/157.diff" diff --git a/ports/libharu/tiff.patch b/ports/libharu/tiff.patch index e40a9bb9e..2aabbe32e 100644 --- a/ports/libharu/tiff.patch +++ b/ports/libharu/tiff.patch @@ -10,3 +10,16 @@ index 2937fc90d..a1a35d0ed 100644 #include "t4.h" typedef unsigned int uint32; +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 354ca7526..ee301d9af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,6 +99,8 @@ if(PNG_FOUND) + set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES}) + endif(PNG_FOUND) + ++find_package(TIFF REQUIRED) ++list(APPEND ADDITIONAL_LIBRARIES TIFF::TIFF) + + # ======================================================================= + # configure header files, add compiler flags