mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:01:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

symbols only clash in static builds

Browse Source
This commit is contained in:
Alexander Neumann 2019-12-09 21:57:03 +01:00
parent c6d89090a9
commit 0b51f928db
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/libharu/portfile.cmake
View File

@ -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"

13
ports/libharu/tiff.patch
View File

@ -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