mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 16:43:02 +08:00
[openmvg] no absolute paths (#24850)
This commit is contained in:
parent
9feca681ef
commit
0e68bd8d02
@ -617,45 +617,6 @@ index 6db7e83..51e06f5 100644
|
||||
${OpenCV_LIBS})
|
||||
target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
index 42b41cc..7fda0cd 100644
|
||||
--- a/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
+++ b/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
@@ -21,7 +21,7 @@
|
||||
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
index 423c85c..0ff2e77 100644
|
||||
--- a/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
+++ b/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
@@ -21,7 +21,7 @@
|
||||
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in
|
||||
index c7361f3..1c56aab 100644
|
||||
--- a/src/software/SfM/tutorial_demo.py.in
|
||||
+++ b/src/software/SfM/tutorial_demo.py.in
|
||||
@@ -12,7 +12,7 @@
|
||||
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp
|
||||
index aa7dffe..2c4d237 100644
|
||||
--- a/src/software/VO/Tracker_opencv_klt.hpp
|
||||
|
66
ports/openmvg/no-absolute-paths.patch
Normal file
66
ports/openmvg/no-absolute-paths.patch
Normal file
@ -0,0 +1,66 @@
|
||||
diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
index 7fda0cd..c6f0bdb 100644
|
||||
--- a/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
+++ b/src/software/SfM/SfM_GlobalPipeline.py.in
|
||||
@@ -16,14 +16,13 @@
|
||||
#
|
||||
# if output_dir is not present script will create it
|
||||
#
|
||||
-
|
||||
+import os
|
||||
# Indicate the openMVG binary directory
|
||||
-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
+OPENMVG_SFM_BIN = os.path.dirname(__file__)
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__)
|
||||
|
||||
-import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
index 0ff2e77..98d3eb2 100644
|
||||
--- a/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
+++ b/src/software/SfM/SfM_SequentialPipeline.py.in
|
||||
@@ -16,14 +16,13 @@
|
||||
#
|
||||
# if output_dir is not present script will create it
|
||||
#
|
||||
-
|
||||
+import os
|
||||
# Indicate the openMVG binary directory
|
||||
-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
+OPENMVG_SFM_BIN = os.path.dirname(__file__)
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__)
|
||||
|
||||
-import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in
|
||||
index 1c56aab..3fb31c4 100644
|
||||
--- a/src/software/SfM/tutorial_demo.py.in
|
||||
+++ b/src/software/SfM/tutorial_demo.py.in
|
||||
@@ -8,13 +8,14 @@
|
||||
# usage : python tutorial_demo.py
|
||||
#
|
||||
|
||||
+import os
|
||||
+
|
||||
# Indicate the openMVG binary directory
|
||||
-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
||||
+OPENMVG_SFM_BIN = os.path.dirname(__file__)
|
||||
|
||||
# Indicate the openMVG camera sensor width directory
|
||||
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
||||
+CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__)
|
||||
|
||||
-import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
@ -16,6 +16,7 @@ vcpkg_from_github(
|
||||
build_fixes.patch
|
||||
0001-eigen_3.4.0.patch
|
||||
0002-eigen-3.4.patch
|
||||
no-absolute-paths.patch
|
||||
)
|
||||
|
||||
set(OpenMVG_USE_OPENMP OFF)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "openmvg",
|
||||
"version": "2.0",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
|
||||
"license": "MPL-2.0-no-copyleft-exception",
|
||||
"dependencies": [
|
||||
|
@ -5170,7 +5170,7 @@
|
||||
},
|
||||
"openmvg": {
|
||||
"baseline": "2.0",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"openmvs": {
|
||||
"baseline": "1.1.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7a97e175386e994ff24a45911a373450d17fe516",
|
||||
"version": "2.0",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4",
|
||||
"version": "2.0",
|
||||
|
Loading…
Reference in New Issue
Block a user