Commit Graph

75 Commits

Author SHA1 Message Date
Ian Bell
4d3289b9ab install to cross-platform folder: 2014-08-15 00:30:32 +02:00
Ian Bell
1452d113cb install to cross-platform folder: 2014-08-15 00:20:20 +02:00
Ian Bell
7418b03cca Fixed CMake for PHP build - installed cmake 3.0.1 to fix on linux 2014-08-15 00:18:38 +02:00
Ian Bell
95c386a94c Octave working again on OSX 2014-08-13 19:57:34 +02:00
Ian Bell
201f069d08 static libraries should build/install now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-13 01:44:11 +02:00
Ian Bell
51b34dcdbe Shared libraries now get the CoolPropLib.cpp file back
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-10 16:16:27 +02:00
Ian Bell
00fe45289a static libraries now build on gcc 2014-08-08 20:12:53 +02:00
Ian Bell
584b975b4b Fixed python files for py3.x I think, though I hate python 3 string handling 2014-08-07 23:27:37 +02:00
Ian Bell
ffe9ec4bbf Fixed EES wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-06 23:23:24 +02:00
Ian Bell
6b7f94df9a Fixed CMake for EES to include CoolPropLib.cpp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-06 22:50:27 +02:00
Ian Bell
f0382746d6 Updated Javascript CMake code 2014-08-06 20:59:07 +02:00
Ian Bell
e99c7c42f2 Added necessary code to get Javascript working on linux with emscripten 2014-08-06 20:41:50 +02:00
Ian Bell
e8dbfded3e Added C++ snippets to docs for API - more work needed here
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 12:58:47 +02:00
Ian Bell
c506fdd3be Added coolpropsi function to EES wrapper and added COOLPROP_EES installer to CMake install listing
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 12:06:29 +02:00
Ian Bell
5df9b0fdcf EES wrapper now works/builds/debugs etc. with v5 - much better debugging enabled - see Readme.txt in wrappers/EES
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-05 11:25:37 +02:00
jowr
4f9df69c96 No problems compiling and running the tests... 2014-08-04 17:14:35 +02:00
Ian Bell
02c3d9c246 snippets now work, need to relocate them
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-04 09:36:23 +02:00
Ian Bell
96329d5228 Added builder for code snippets 2014-08-04 02:04:48 +02:00
Ian Bell
78949c0556 Fixed typo in CMakeLists.txt
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 16:14:33 +02:00
Ian Bell
4d346c6921 Updated files for python building
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 16:09:27 +02:00
Ian Bell
1c093c757e prepared for python on buildbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 15:54:10 +02:00
Ian Bell
1dfd6c6a41 Fixed CMake for EES module 2014-08-01 22:33:39 +02:00
Ian Bell
ffa9f536d6 Added shared libraries 2014-08-01 22:17:34 +02:00
Ian Bell
f653a7559f Worked on a cleaner Octave CMake finder module 2014-08-01 22:06:18 +02:00
Ian Bell
e7391bb60c Fixed include path for java on linux
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:34:52 +02:00
Ian Bell
d36d79e542 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-30 20:46:16 +02:00
Ian Bell
226447bf76 Updated files to compile MATLAB wrapper on OSX and windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 20:45:51 +02:00
Ian Bell
0575f2f483 Modified CMake files to get MATLAB working on OSX 2014-07-30 18:05:08 +02:00
Ian Bell
2da87c2e48 Updated CMake for Octave to check more intelligently for libc++ 2014-07-28 00:03:35 +02:00
Ian Bell
fa25d1b4c0 Fixed CMake for for Octave 2014-07-27 23:33:38 +02:00
Ian Bell
c553f0a2ff Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-10 15:58:53 +02:00
Ian Bell
d6402128f8 Added cmake code for compiling main.cxx
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 20:09:56 +02:00
Ian Bell
bce90e4708 Update Octave build to use static libraries 2014-07-08 16:21:10 +02:00
Ian Bell
df5cded58c Find static libraries on OSX (others broken)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 13:25:09 +02:00
Ian Bell
6779185349 Octave libraries are linked static
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 13:19:01 +02:00
Ian Bell
343f47f61a Updated CMakeLists.txt to give more verbose library information for Octave on OSX
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 11:18:27 +02:00
Ian Bell
43c248c0bc Added back test_main.cpp, renamed to test_main.cxx so it won't be found by *.cpp globbing
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 23:35:53 +02:00
Ian Bell
9a00846b1c Fixed CMake file to compile Catch test 2014-07-06 20:32:58 +02:00
Ian Bell
70e6e09bd5 Include Octave version in install folder 2014-07-06 19:06:25 +02:00
Ian Bell
fd209a20d5 Some progress getting Octave working on OSX, still not working yet 2014-07-06 19:05:37 +02:00
Ian Bell
a66e05ad58 Fixed Java testing on linux - run with
cmake ../.. -DCOOLPROP_JAVA_MODULE=ON -DBUILD_TESTING=ON && make install && ctest --verbose
2014-07-06 13:22:07 +02:00
Ian Bell
57b3f3daf3 C# tests run on windows with
cmake ..\.. -G "Visual Studio 10" -DCOOLPROP_CSHARP_MODULE=ON -DBUILD_TESTING=ON && cmake --build . --target INSTALL && ctest --verbose -C "Release"

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 13:14:12 +02:00
Ian Bell
19a9e1a802 C# testing works on linux with
cmake ../.. -DCOOLPROP_CSHARP_MODULE=ON -DBUILD_TESTING=ON && make install && ctest --verbose
2014-07-06 12:42:37 +02:00
Ian Bell
2311531c82 Java testing working on linux now 2014-07-06 11:57:24 +02:00
Ian Bell
15f94c5c4c Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-06 11:42:22 +02:00
Ian Bell
7d9c0bffdf Fixed Eigen include in CMake and moved num_rows and num_cols to placate gcc 2014-07-06 11:31:19 +02:00
Ian Bell
313d13afe9 Updated CMake file to include testing for Java - works!
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 11:17:10 +02:00
Ian Bell
f2f9eb1866 CMake file works for SWIG MATLAB, started adding install paths for DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 16:52:43 +02:00
Ian Bell
5c5e077a66 Added COOLPROP_LIB and CONVENTION=__cdecl to static library. Will only impact c-style exports, so should be safe.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-20 13:06:39 +02:00
Ian Bell
3127ace162 MATLAB works on windows - 32-bit and 64-bit
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-11 12:16:48 +02:00