Commit Graph

131 Commits

Author SHA1 Message Date
Ian Bell
c9ea4f94f4 Add the ability to provide your own main.cpp (or similar) file to cmake compilation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-07 23:05:27 -05:00
Ian Bell
7d41e016a5 Bump revision to 5.0.4
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-06 17:36:02 -05:00
Ian Bell
8231f43398 Bumped revision to v5.0.3, release ready
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-06 16:30:00 -05:00
Ian Bell
93305f0413 Added MathCAD support and docs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-04 21:07:37 -05:00
Ian Bell
32ccb78250 Disable internal error catching and allow swig to do the error catching itself
See https://github.com/CoolProp/CoolProp/issues/282

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-04 17:00:54 -05:00
Jorrit Wronski
f8aae66ed3 Bumping revision to 5.0.2, successfully tested release script on server to publish version 5.0.1. 2014-12-03 11:58:08 +01:00
Ian Bell
6eb5afab8a bump version to 5.0.1
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-03 00:40:31 -05:00
Ian Bell
15abcfe359 MATLAB is now using static c runtime on windows builds
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 18:45:20 -05:00
Ian Bell
5727609c9a Install SwigRef.m as well for MATLAB
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 18:24:02 -05:00
Ian Bell
e0a4fe4171 Fix testing of Matlab wrappers hopefully
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-20 21:45:30 -05:00
Ian Bell
cc8d831207 Add test for MATLAB
Closes https://github.com/CoolProp/CoolProp/issues/202

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-20 12:55:05 -05:00
Ian Bell
8a7c1b9d12 Add dependency for matlab swig so that it rebuilds if there are changes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-20 12:49:52 -05:00
Ian Bell
c2c43caab3 Another attempt at VxWorks install path
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-16 18:00:54 -05:00
Ian Bell
117e714c5b More hardcoded installation path for VxWorks
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-16 17:21:12 -05:00
Ian Bell
3453351ef6 Add VxWorks builder for buildbot for linux slave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-16 16:16:53 -05:00
Ian Bell
f06d547f59 Fixed CMake for VxWorks 2014-11-16 21:55:37 +01:00
Ian Bell
1b91d51ae6 Updates to make VxWorks play nicely with CMake using cross-compilation 2014-11-13 05:33:49 +01:00
Ian Bell
63912650ce Fixed cmake arguments for things that use swig
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-11 20:39:18 -05:00
Ian Bell
46bd4788f1 Fixed CMakeLists.txt to handle SWIG options that have spaces - as they must for -package
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-12 02:06:42 +01:00
Ian Bell
6613638ced Updated Java wrapper to allow for different package
See issue https://github.com/CoolProp/CoolProp/issues/205

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-07 11:47:17 -05:00
Ian Bell
0daa621cb5 Updated scilab builder install
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-28 13:48:47 -04:00
Ian Bell
7ccf9ac583 MATLAB CMake work
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-28 13:21:51 -04:00
Ian Bell
f2ed3ba85c Fixed excel wrapper on osx 2014-10-28 04:30:47 +01:00
Ian Bell
d686367683 Fixed 32-bit shared library in CMake 2014-10-28 02:36:31 +01:00
Jorrit Wronski
15dc8567cc Added a new bitness treatment, should simplify the module sections 2014-10-24 14:35:08 +01:00
Jorrit Wronski
420606689a Added forceable bitness 2014-10-24 12:54:49 +01:00
Ian Bell
b87d7ad1b9 Fixed scilab building using new version of swig+scilab 2014-10-22 22:05:35 +02:00
Ian Bell
599bd58668 Fixed escaping in bb; reverted changes in CMake
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-03 15:49:02 +02:00
Ian Bell
3022d1889e Octave might work on windows now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-03 15:30:57 +02:00
Ian Bell
379be8831d Add permissive to get octave to build on windows (maybe)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 21:57:45 +02:00
Ian Bell
063b57ec9f 7z up Csharp and Java generated files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 21:54:11 +02:00
Ian Bell
1bff16ee93 Add PYPI slave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-01 17:55:39 +02:00
Ian Bell
0c5c7ec01c CMake does not use EXTERNC by default for static library
* Unless you ask for -DCOOLPROP_EXTERN_STATIC_LIBRARY=ON

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 18:06:12 +02:00
Ian Bell
ef34cd489b updated CMake for scilab 2014-09-15 19:03:47 +02:00
Ian Bell
e13abc5c70 More work on scilab wrapper, almost done 2014-09-15 01:50:34 +02:00
Ian Bell
cd3df82c90 Added scilab code for CMake, we shall see… 2014-09-15 00:54:16 +02:00
Ian Bell
14514ce234 Fix CMakeLists.txt so that it will inherit the right python version from anaconda
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-13 01:18:09 +02:00
Ian Bell
90702038b8 Added PROPERTIES for windows matlab builds
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 17:05:05 +02:00
Ian Bell
70c06b26d2 Do not install .lib files for mex libraries on windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 16:42:59 +02:00
Ian Bell
61a12ba62c Cleaned up some build issues with InnoSetup+EES
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:43:59 +02:00
jowr
ab026b6463 builds debian packages now. might need some more refining work... 2014-08-25 11:24:59 +02:00
jowr
40c6c3ee48 Merge branch 'master' into debianPackaging 2014-08-25 10:26:13 +02:00
jowr
077764e6a3 Added library targets to CMAKE 2014-08-25 10:25:44 +02:00
Ian Bell
ef855a1d77 Added Catch-Tests.cpp to Catch build so that it will run all those tests too
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-25 00:20:58 +02:00
jowr
a784b5eca3 Started work on the packaging for debian. Still some issues with the install prefix... 2014-08-22 15:57:07 +02:00
Ian Bell
4280047cd5 Add 32-bit shared library target for linux 2014-08-22 10:42:59 +02:00
Ian Bell
d928457cc1 Also save print out the exports for the shared libraries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 19:11:10 +02:00
Ian Bell
8b12bca508 Added CoolPropLib.h to all DLL builds
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 18:48:50 +02:00
Ian Bell
6df7d1f287 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-08-19 18:22:52 +02:00
Ian Bell
96aa60e773 changed flags for address sanitizer build 2014-08-19 18:22:35 +02:00