Skip to content

[baseline][colmap] Fix find dependency freeimage #15886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 2 commits into from
Jan 28, 2021
Merged

[baseline][colmap] Fix find dependency freeimage #15886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e34b990
[colmap] Fix find dependency freeimage
Jan 26, 2021
451e6e4
update version record
Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/colmap/fix-dependency-freeimage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

1 change: 1 addition & 0 deletions ports/colmap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
1 change: 1 addition & 0 deletions ports/colmap/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@
},
"colmap": {
"baseline": "3.6",
"port-version": 0
"port-version": 1
},
"comms": {
"baseline": "3.1.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/colmap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1f88c10f0bc3819bae7c197375bba335106726f1",
"version-string": "3.6",
"port-version": 1
},
{
"git-tree": "e2d108b4334d41c2cc500c5dfe4c389127a46220",
"version-string": "3.6",
Expand Down