github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-21 03:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on #868, changed fortran compilers and updated gcc

Browse Source
This commit is contained in:
Jorrit Wronski
2015-11-15 11:28:19 +01:00
parent faa18cb9d1
commit 0f99d224fa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,7 +553,8 @@ def fortranFactory(platform=1,bitness=1):
cmake_args += ["-G", "\"MinGW Makefiles\""]
cp_cmd = "copy /Y *.f90 ..\\..\\..\\build"
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "gfortran -o main cpinterface.o cool_fortran_bind.o libCoolProp.a -lstdc++"
#link_cmd = "gfortran -o main cpinterface.o cool_fortran_bind.o libCoolProp.a -lstdc++"
link_cmd = "gcc -o main *.o libCoolProp.a -lstdc++ -lgfortran"
exec_cmd = "main"
elif platform==platformID["linux"]:
cmake_args += []
@@ -562,10 +563,10 @@ def fortranFactory(platform=1,bitness=1):
link_cmd = "gfortran -o main cpinterface.o cool_fortran_bind.o libCoolProp.a -lstdc++ -ldl"
exec_cmd = "./main"
elif platform==platformID["osx"]:
cmake_args += ['-DCMAKE_C_COMPILER="/usr/local/bin/gcc-4.9"','-DCMAKE_CXX_COMPILER="/usr/local/bin/g++-4.9"']
#cmake_args += ['-DCMAKE_C_COMPILER="/usr/local/bin/gcc-5"','-DCMAKE_CXX_COMPILER="/usr/local/bin/g++-5"']
cp_cmd = "cp *.f90 ../../../build/"
build_cmd = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "g++-4.9 -o main cpinterface.o cool_fortran_bind.o libCoolProp.a -lstdc++ -ldl -lgfortran"
build_cmd = "gfortran-5 -c -Wall cpinterface.f90 cool_fortran_bind.f90"
link_cmd = "g++-5 -o main cpinterface.o cool_fortran_bind.o libCoolProp.a -lstdc++ -ldl -lgfortran"
exec_cmd = "./main"
else:
raise ValueError("Unknown Fortran platform: {0}".format(platform))