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

Added source for OSX to activate environment

Browse Source
This commit is contained in:
Ian Bell
2014-08-11 23:04:05 +02:00
parent 6c491467cd
commit c55f9b4d16
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,12 @@ def python_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, buil
factory.addStep(Git(repourl='git://github.com/CoolProp/CoolProp', mode=git_mode, submodules = True, progress=True, haltOnFailure = True))
# Remove the temporary folder for installs
factory.addStep(RemoveDirectory(dir="build/install_root", haltOnFailure = True))
if platform.find('OSX') > -1:
source = 'source'
else:
source = ''
factory.addStep(ShellCommand(command=["activate",conda_env,"cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
env = cmake_env,
workdir= working_folder,
haltOnFailure = True))