Skip to content

Commit d137c08

Browse files
authored
Merge pull request #2757 from alicevision/dev/avLibpath
Add support for `ALICEVISION_LIBPATH` environment variable
2 parents 11aae7e + c055f2b commit d137c08

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

meshroom/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,12 @@ def addToEnvPath(var, val, index=-1):
150150
if key not in os.environ and os.path.exists(value):
151151
logging.debug(f"Set {key}: {value}")
152152
os.environ[key] = value
153+
154+
addToEnvPath("PATH", os.environ.get("ALICEVISION_BIN_PATH", ""))
155+
if sys.platform == "win32":
156+
addToEnvPath("PATH", os.environ.get("ALICEVISION_LIBPATH", ""))
153157
else:
154-
addToEnvPath("PATH", os.environ.get("ALICEVISION_BIN_PATH", ""))
158+
addToEnvPath("LD_LIBRARY_PATH", os.environ.get("ALICEVISION_LIBPATH", ""))
155159

156160

157161
os.environ["QML_XHR_ALLOW_FILE_READ"] = '1'

start.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ REM set MESHROOM_OUTPUT_QML_WARNINGS=1
99
REM set MESHROOM_INSTANT_CODING=1
1010
REM set QT_PLUGIN_PATH=C:\dev\meshroom\install
1111
REM set QML2_IMPORT_PATH=C:\dev\meshroom\install\qml
12-
REM set PATH=C:\dev\AliceVision\install\bin;C:\dev\vcpkg\installed\x64-windows\bin;%PATH%
1312
REM set ALICEVISION_ROOT=C:\dev\AliceVision\install
13+
REM set ALICEVISION_LIBPATH=%ALICEVISION_ROOT%\bin;C:\dev\vcpkg\installed\x64-windows\bin
1414

15-
python meshroom\ui
15+
REM PYTHONPATH=%ALICEVISION_ROOT%\lib\python;%PYTHONPATH%
1616

17+
python meshroom\ui

0 commit comments

Comments
 (0)