[openmvs] no absolute paths (#24848)

This commit is contained in:
autoantwort 2022-06-01 00:12:09 +02:00 committed by GitHub
parent 8f77dbb04f
commit 9feca681ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 19 deletions

View File

@ -107,23 +107,6 @@ rename to MvgMvsPipeline.py.in
index f4914bf..23d03e6 100644
--- a/MvgMvsPipeline.py
+++ b/MvgMvsPipeline.py.in
@@ -91,12 +91,12 @@ def find(afile):
# Try to find openMVG and openMVS binaries in PATH
-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing")
-OPENMVS_BIN = whereis("ReconstructMesh")
+OPENMVG_BIN = "@OPENMVG_TOOLS_PATH@"
+OPENMVS_BIN = "@OPENMVS_TOOLS_PATH@"
# Try to find openMVG camera sensor database
-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt"
-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE)
+CAMERA_SENSOR_DB_FILE = "@SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH@"
+CAMERA_SENSOR_DB_DIRECTORY = "@OPENMVG_TOOLS_PATH@"
# Ask user for openMVG and openMVS directories if not found
if not OPENMVG_BIN:
@@ -175,10 +175,10 @@ class StepsStore:
["-i", "%input_dir%", "-o", "%matches_dir%", "-d", "%camera_file_params%"]],
["Compute features", # 1

View File

@ -0,0 +1,24 @@
diff --git a/MvgMvsPipeline.py.in b/MvgMvsPipeline.py.in
index 04433f4..e1beaf6 100644
--- a/MvgMvsPipeline.py.in
+++ b/MvgMvsPipeline.py.in
@@ -95,14 +95,14 @@ def find(afile):
return d
return None
-
+current_dir = os.path.dirname(os.path.abspath(__file__))
# Try to find openMVG and openMVS binaries in PATH
-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing")
-OPENMVS_BIN = whereis("ReconstructMesh")
+OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg')
+OPENMVS_BIN = current_dir
# Try to find openMVG camera sensor database
-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt"
-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE)
+CAMERA_SENSOR_DB_FILE = os.path.join(OPENMVG_BIN, 'sensor_width_camera_database.txt')
+CAMERA_SENSOR_DB_DIRECTORY = OPENMVS_BIN
# Ask user for openMVG and openMVS directories if not found
if not OPENMVG_BIN:

View File

@ -9,6 +9,7 @@ vcpkg_from_github(
PATCHES
fix-build.patch
fix-build-boost-1_77_0.patch
no-absolute-paths.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,7 @@
{
"name": "openmvs",
"version": "1.1.1",
"port-version": 2,
"port-version": 3,
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
"homepage": "https://cdcseacave.github.io/openMVS",
"dependencies": [

View File

@ -5174,7 +5174,7 @@
},
"openmvs": {
"baseline": "1.1.1",
"port-version": 2
"port-version": 3
},
"openni2": {
"baseline": "2.2.0.33",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b6123f8755c140325b2800c51c6c68e3fb51c668",
"version": "1.1.1",
"port-version": 3
},
{
"git-tree": "a66ad18d59e5ffdd21f5bc1cae0b195ba35aba18",
"version": "1.1.1",