diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-01-27 18:18:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 18:18:22 -0800 |
| commit | 09fbac728383879fa6fec703c5898f2b6c923591 (patch) | |
| tree | 593cf02d2914ccac289786e3291d2844dfab6ca0 | |
| parent | 421777e4b211f647cc716f1ed9544d149ecc5778 (diff) | |
| download | vcpkg-09fbac728383879fa6fec703c5898f2b6c923591.tar.gz vcpkg-09fbac728383879fa6fec703c5898f2b6c923591.zip | |
[baseline][colmap] Fix find dependency freeimage (#15886)
* [colmap] Fix find dependency freeimage
* update version record
| -rw-r--r-- | ports/colmap/fix-dependency-freeimage.patch | 14 | ||||
| -rw-r--r-- | ports/colmap/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/colmap/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/colmap.json | 5 |
5 files changed, 22 insertions, 1 deletions
diff --git a/ports/colmap/fix-dependency-freeimage.patch b/ports/colmap/fix-dependency-freeimage.patch new file mode 100644 index 000000000..29b591e34 --- /dev/null +++ b/ports/colmap/fix-dependency-freeimage.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b05097c..cdd8ca4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,7 +96,8 @@ find_package(Boost REQUIRED COMPONENTS + + find_package(Eigen3 REQUIRED) + +-find_package(FreeImage REQUIRED) ++find_package(freeimage CONFIG REQUIRED) ++set(FREEIMAGE_LIBRARIES freeimage::FreeImage) + + find_package(Glog REQUIRED) + diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 6b9bf3284..4ab35bbc3 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF ${COLMAP_REF} SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632 HEAD_REF dev + PATCHES fix-dependency-freeimage.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 6feee3ee0..5a43d64f8 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version-string": "3.6", + "port-version": 1, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 32ffa2770..ebd7234ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1266,7 +1266,7 @@ }, "colmap": { "baseline": "3.6", - "port-version": 0 + "port-version": 1 }, "comms": { "baseline": "3.1.3", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 712aae6b4..026bb1763 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "1f88c10f0bc3819bae7c197375bba335106726f1", + "version-string": "3.6", + "port-version": 1 + }, + { "git-tree": "e2d108b4334d41c2cc500c5dfe4c389127a46220", "version-string": "3.6", "port-version": 0 |