github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

from winbuilds to mingw-x64

Browse Source
This commit is contained in:
Ian Bell
2020-05-07 08:02:41 -04:00
parent 6d2a4643cf
commit cf40509b39
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev/buildbot/master/master.cfg
View File

@@ -845,16 +845,16 @@ def cmake_slave(mod_name, platform, install = True, cmake_args = [], build_args
pre = []
if platform.lower() == 'windows':
if mod_name.lower() == 'octave':
pre = ['set','"PATH=%OCTAVE_ROOT%/mingw64/bin;c:/Users/ian/winbuilds/bin;%PATH%"','&&']
pre = ['set','"PATH=%OCTAVE_ROOT%/mingw64/bin;%MINGW64_BIN%;%PATH%"','&&']
elif mod_name.lower() == 'r':
pre = ['set','"PATH=c:/Users/ian/winbuilds/bin;%PATH%"','&&']
pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&']
elif 'xtern' in mod_name.lower():
pre = ['set','"PATH=c:/Users/ian/winbuilds64/bin;%PATH%"','&&'] ## GCC+C++
pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&'] ## GCC+C++
elif 'shared_library_mingw' in mod_name:
if '32' in mod_name:
pre = ['set','"PATH=c:/Users/ian/winbuilds/bin;%PATH%"','&&']
pre = ['set','"PATH=%MINGW_BIN%;%PATH%"','&&']
else:
pre = ['set','"PATH=c:/Users/ian/winbuilds64/bin;%PATH%"','&&']
pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&']
factory.addStep(ShellCommand(command=' '.join(pre+["cmake", "..", "-DCOOLPROP_"+mod_name.upper()+"_MODULE=ON","-DBUILD_TESTING=ON"]+cmake_args),
env = cmake_env,