aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-03-31 14:38:36 +0800
committerPhil Christensen <philc@microsoft.com>2019-03-30 23:38:36 -0700
commit3cc4de62c1a2d6000687573d2d90893fa76d1816 (patch)
treef6bfcdddde25c6f8222d43f85007c5ac71afe6a1
parent125df93c5e692cdc97204663067230c45668192a (diff)
downloadvcpkg-3cc4de62c1a2d6000687573d2d90893fa76d1816.tar.gz
vcpkg-3cc4de62c1a2d6000687573d2d90893fa76d1816.zip
[libharu]fix build failure. (#5628)
* [libharu]fix build failure. * [libharu]Comment more code
-rw-r--r--ports/libharu/CONTROL2
-rw-r--r--ports/libharu/fix-build-fail.patch21
-rw-r--r--ports/libharu/portfile.cmake1
3 files changed, 23 insertions, 1 deletions
diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL
index 623628ab8..c4f48ab3d 100644
--- a/ports/libharu/CONTROL
+++ b/ports/libharu/CONTROL
@@ -1,4 +1,4 @@
Source: libharu
-Version: 2017-08-15-d84867ebf9f-4
+Version: 2017-08-15-d84867ebf9f-5
Description: libharu - free PDF library
Build-Depends: zlib, libpng
diff --git a/ports/libharu/fix-build-fail.patch b/ports/libharu/fix-build-fail.patch
new file mode 100644
index 000000000..2f7066575
--- /dev/null
+++ b/ports/libharu/fix-build-fail.patch
@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9d2a604..be8e964 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -79,11 +79,11 @@ if(LIBHPDF_STATIC)
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin
+ )
+- if(WIN32 AND NOT CYGWIN)
+- foreach(addlib ${ADDITIONAL_LIBRARIES})
+- install(FILES ${addlib} DESTINATION lib)
+- endforeach(addlib)
+- endif(WIN32 AND NOT CYGWIN)
++ #if(WIN32 AND NOT CYGWIN)
++ #foreach(addlib ${ADDITIONAL_LIBRARIES})
++ #install(FILES ${addlib} DESTINATION lib)
++ #endforeach(addlib)
++ #endif(WIN32 AND NOT CYGWIN)
+ endif(LIBHPDF_STATIC)
+ if(LIBHPDF_SHARED)
+ add_library(${LIBHPDF_NAME} SHARED ${LIBHPDF_SRCS})
diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake
index c8e9250b9..42f85c2b4 100644
--- a/ports/libharu/portfile.cmake
+++ b/ports/libharu/portfile.cmake
@@ -5,6 +5,7 @@ vcpkg_from_github(
REF d84867ebf9f3de6afd661d2cdaff102457fbc371
SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99
HEAD_REF master
+ PATCHES fix-build-fail.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBHPDF_STATIC)