mirror of
https://github.com/Cantera/cantera.git
synced 2026-08-11 05:24:57 -05:00
Improve handling of dynamic library paths on Mac/Windows
This commit is contained in:
+1
-1
@@ -415,7 +415,7 @@ config_options = [
|
||||
"""Environment variables to propagate through to SCons. Either the
|
||||
string 'all' or a comma separated list of variable names, for example,
|
||||
'LD_LIBRARY_PATH,HOME'.""",
|
||||
"PATH,LD_LIBRARY_PATH,PYTHONPATH"),
|
||||
"PATH,LD_LIBRARY_PATH,DYLD_LIBRARY_PATH,PYTHONPATH"),
|
||||
BoolOption(
|
||||
"use_pch",
|
||||
"Use a precompiled-header to speed up compilation",
|
||||
|
||||
+6
-1
@@ -45,7 +45,12 @@ localenv.PrependENVPath('PYTHONPATH', Dir('#test/python').abspath)
|
||||
PASSED_FILES = {}
|
||||
|
||||
# Add build/lib in order to find Cantera shared library
|
||||
localenv.PrependENVPath('LD_LIBRARY_PATH', Dir('#build/lib').abspath)
|
||||
if env["OS"] == "Windows":
|
||||
localenv.PrependENVPath('PATH', Dir('#build/lib').abspath)
|
||||
elif env['OS'] == 'Darwin':
|
||||
localenv.PrependENVPath('DYLD_LIBRARY_PATH', Dir('#build/lib').abspath)
|
||||
else:
|
||||
localenv.PrependENVPath('LD_LIBRARY_PATH', Dir('#build/lib').abspath)
|
||||
|
||||
def addTestProgram(subdir, progName, env_vars={}):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user