[setup] add aliceVision lib64 folder to LD_LIBRARY_PATH

This commit is contained in:
Fabien Castan 2018-08-07 21:29:02 +02:00
parent 9f5366589e
commit 7aae234b02

View file

@ -69,16 +69,17 @@ def setupEnvironment():
aliceVisionDir = os.path.join(rootDir, "aliceVision") aliceVisionDir = os.path.join(rootDir, "aliceVision")
# default directories # default directories
aliceVisionBinDir = os.path.join(aliceVisionDir, "bin") aliceVisionBinDir = os.path.join(aliceVisionDir, "bin")
aliceVisionLibDir = os.path.join(aliceVisionDir, "lib64") # Unix
aliceVisionShareDir = os.path.join(aliceVisionDir, "share") aliceVisionShareDir = os.path.join(aliceVisionDir, "share")
qtPluginsDir = os.path.join(rootDir, "qtPlugins") qtPluginsDir = os.path.join(rootDir, "qtPlugins")
sensorDBPath = os.path.join(aliceVisionShareDir, "cameraSensors.db") sensorDBPath = os.path.join(aliceVisionShareDir, "cameraSensors.db")
voctreePath = os.path.join(aliceVisionShareDir, "vlfeat_K80L3.tree") voctreePath = os.path.join(aliceVisionShareDir, "vlfeat_K80L3.tree")
# Linux: "lib" contains shared libraries that needs to be in LD_LIBRARY_PATH # Unix: "lib" contains shared libraries that needs to be in LD_LIBRARY_PATH
libPath = os.path.join(rootDir, "lib") libDir = os.path.join(rootDir, "lib")
env = { env = {
'PATH': aliceVisionBinDir, 'PATH': aliceVisionBinDir,
'LD_LIBRARY_PATH': [aliceVisionBinDir, libPath], 'LD_LIBRARY_PATH': [libDir, aliceVisionLibDir], # Unix
'QT_PLUGIN_PATH': [qtPluginsDir], 'QT_PLUGIN_PATH': [qtPluginsDir],
'QML2_IMPORT_PATH': [os.path.join(qtPluginsDir, "qml")] 'QML2_IMPORT_PATH': [os.path.join(qtPluginsDir, "qml")]
} }