Commit Graph

715 Commits

Author SHA1 Message Date
Ian bell
7e34a8550a Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-17 19:54:42 +02:00
Ian bell
eeab8e18fe Use cpversion.h instead of version.h to reduce name clashing in headers
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-17 19:54:28 +02:00
Rod Persky
ffd9c007e5 CMake
Can now compile with catch with no errors, although there are errors within the
test cases. Also added a check in the generate_headers.py file to see if the
headers have already been generated (this is a proposal and can be removed)
because it's time consuming when there is no changes to those files. the change
is fairly dumb (check if file .JSON_done exists) and doesn't consider the
modification time of the files.
2014-05-17 17:00:38 +10:00
Rod Persky
f41dbe60e2 added dl 2014-05-17 12:34:34 +10:00
jowr
47bb064717 Playing with CMake... 2014-05-16 13:47:49 +02:00
jowr
8e71eebc3b Added catch tests for polymath 2014-05-16 11:45:25 +02:00
Jorrit Wronski
55c8a292fa Merge pull request #25 from Rod-Persky/python-args
Added parameter for path to JSON_to_CPP.py
2014-05-16 09:13:22 +02:00
Rod Persky
df425fba4a readme stub in dev/
Basic description of how to build coolprop.
2014-05-16 16:48:28 +10:00
Rod Persky
cd571e6797 Path
generate_headers.py may not be called from the correct path, so get the
path of generate_headers.py and determine the base path from there
assuming generate_headers.py will be in dev/
2014-05-16 16:36:44 +10:00
Rod Persky
cad756ba18 Added parameter for path to JSON_to_CPP.py
set path through --path that is the root directory for the code. The
default is None as this was the previous behavior, however this does not
make sense.

Also the path name is normalised as, depending on OS there is confusion
on slash direction.
2014-05-16 15:43:42 +10:00
Ian bell
463c40fcf0 Small work on the docs - doxylink needs to be fed an absolute path, but otherwise seems good. Might need to generate the absolute path at runtime somehow. Its different between local and remote locations of HTML.
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-15 23:43:58 +02:00
Ian bell
703bbfcec1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-15 22:30:54 +02:00
Ian bell
5edd9415ba Updated script to generate constants module by parsing the parameters enum
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-15 22:21:15 +02:00
jowr
849da310e2 PolyMath is not fully implemented, but seems to work. There is a main method for testing. 2014-05-15 19:01:28 +02:00
Ian bell
b3847c7522 Initial commit for v5, but this time with the right line endings
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-14 12:46:24 +02:00