diff options
| author | Hiroshi Miura <miurahr@linux.com> | 2018-08-03 16:14:51 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-03 00:14:51 -0700 |
| commit | 3eeaf564d1714ee533c59e7c79cf5e19a1b4e983 (patch) | |
| tree | 84e5bd12d1eb98ccc4bd8b89d22cd11ab979c665 /ports/leptonica | |
| parent | 09ccd053dbb0b48833fa82331d1fbdccd9cb054a (diff) | |
| download | vcpkg-3eeaf564d1714ee533c59e7c79cf5e19a1b4e983.tar.gz vcpkg-3eeaf564d1714ee533c59e7c79cf5e19a1b4e983.zip | |
[libgeotiff] support linux build (#3843)
* [libgeotiff] fix compile on linux
Fix cmake libtiff functions detetion failure
caused by finding no functions in libm.
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
* [libgeotiff] fix utility binary handling in linux
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
* [tiff] Fix static transitive dependencies
* [libgeotiff] Fix .dll and .exe manipulation
* [leptonica] Find dependencies in installed cmake config file
* [tiff] Do not add cmake targets to TIFF_LIBRARIES
* [tiff] Link consumers against m on unix platforms
Diffstat (limited to 'ports/leptonica')
| -rw-r--r-- | ports/leptonica/CONTROL | 2 | ||||
| -rw-r--r-- | ports/leptonica/find-dependency.patch | 18 | ||||
| -rw-r--r-- | ports/leptonica/portfile.cmake | 5 |
3 files changed, 20 insertions, 5 deletions
diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL index 2be42f327..e3543173f 100644 --- a/ports/leptonica/CONTROL +++ b/ports/leptonica/CONTROL @@ -1,4 +1,4 @@ Source: leptonica -Version: 1.74.4-3 +Version: 1.74.4-5 Description: An open source library containing software that is broadly useful for image processing and image analysis applications Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib diff --git a/ports/leptonica/find-dependency.patch b/ports/leptonica/find-dependency.patch new file mode 100644 index 000000000..46348833e --- /dev/null +++ b/ports/leptonica/find-dependency.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
+index d53904a..2aa2fea 100644
+--- a/cmake/templates/LeptonicaConfig.cmake.in
++++ b/cmake/templates/LeptonicaConfig.cmake.in
+@@ -20,6 +20,13 @@
+ #
+ # ===================================================================================
+
++include(CMakeFindDependencyMacro)
++find_dependency(TIFF)
++find_dependency(ZLIB)
++find_dependency(PNG)
++find_dependency(JPEG)
++find_dependency(GIF)
++
+ include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
+
+ # ======================================================
diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index acaf7fe9d..156ed3dd2 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -6,13 +6,10 @@ vcpkg_from_github( REF 1.74.4 SHA512 3b9d0be937883f733f72cbdf0b624ec245d9256a8b4622997f437d309efd7ad9695ad1cbe2224d543eb3ef8c44833567b3cc9a95e9a774ef9046b7acaf0ae744 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch ${CMAKE_CURRENT_LIST_DIR}/use-tiff-libraries.patch + ${CMAKE_CURRENT_LIST_DIR}/find-dependency.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) |