One more try with the PATH on windows

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-10-28 15:16:39 -04:00
parent e2ed2d39b1
commit db545f3397

View File

@@ -552,7 +552,7 @@ def swig_matlab_builder(platform, gitMode = 'incremental'):
factory.addStep(ShellCommand(command = '7z -y -obuild x swig_MATLAB.7z', workdir = 'build', haltOnFailure = True))
if platform == 'windows':
command = ["set", '"PATH=swig-matlab-bin/bin:${PATH}"', "&&", "cmake", "..", "-DCOOLPROP_MATLAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-matlab-bin/bin"]
command = ["set", '"PATH=swig-matlab-bin/bin;%PATH%"', "&&", "cmake", "..", "-DCOOLPROP_MATLAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-matlab-bin/bin"]
else:
command = ["PATH=swig-matlab-bin/bin:${PATH}","cmake", "..", "-DCOOLPROP_MATLAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-matlab-bin/bin"]
factory.addStep(ShellCommand(command=' '.join(command),
@@ -588,7 +588,7 @@ def swig_scilab_builder(platform, gitMode = 'incremental'):
# Unzip
factory.addStep(ShellCommand(command = '7z -y -obuild x swig_SCILAB.7z', workdir = 'build', haltOnFailure = True))
if platform == 'windows':
command = ["set", '"PATH=swig-scilab-bin/bin:${PATH}"', "&&", "cmake", "..", "-DCOOLPROP_SCILAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-scilab-bin"]
command = ["set", '"PATH=swig-scilab-bin/bin;%PATH%"', "&&", "cmake", "..", "-DCOOLPROP_SCILAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-scilab-bin"]
else:
command = ["PATH=swig-scilab-bin/bin:${PATH}","cmake", "..", "-DCOOLPROP_SCILAB_SWIG_MODULE=ON","-DSWIG_DIR=swig-scilab-bin"]
factory.addStep(ShellCommand(command=' '.join(command),