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
553 Commits 47 Branches 30 Tags
4c886c79fbcd255fc7f42c0109b070ab4bfad5cc
Commit Graph

51 Commits

Author SHA1 Message Date
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
Ian Bell
c241c516c6 Added dependency on generate_headers to most of the wrappers 2014-06-11 01:10:08 +02:00
Ian Bell
9f857164fd Java works on linux 2014-06-10 12:34:37 +02:00
Ian Bell
066dcfc413 Java now works on windows 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 12:13:29 +02:00
Ian Bell
341ba11a24 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 11:31:56 +02:00
Ian Bell
4f1f53881f Preliminary CMake for Java 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 11:31:43 +02:00
Ian Bell
e3282c8059 C# works on linux 2014-06-10 01:16:42 +02:00
Ian Bell
845427a268 C# "works" on windows - "works" meaning that it compiles, but some parts don't yet work properly. Example runs, but many failures 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 00:44:43 +02:00
Ian Bell
1d16cc14e1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 00:09:30 +02:00
Ian Bell
47486f81e0 Fixed creation of src folder for GCC builds 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 00:09:00 +02:00
Ian Bell
db6e794dba Now octave works on xubuntu with main CMake file - have to mkdir src folder - not sure why. 2014-06-09 23:58:29 +02:00
Ian Bell
62e9a2d4de Octave wrapper works on windows with MINGW builds of Octave 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 23:46:43 +02:00
Ian Bell
895c1de278 CMake now working for 64-bit DLL 32-bit/cdecl DLL and 32-bit/stdcall DLL. Swig ones are next. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 21:08:04 +02:00
Ian Bell
a866ad88a3 EES DLF file can now build using CMake - works 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 19:50:10 +02:00
Ian Bell
eddbfc0ec1 When building DLL, apply the COOLPROP_LIB macro to export the functions to the DLL 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 19:12:31 +02:00
Ian bell
1c5d9a44b6 Fixed Cmake file on windows 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-18 01:20:10 +02:00
Rod Persky
56c68664ed fix 2014-05-17 18:09:49 +10:00
Rod Persky
affa330456 fix 2014-05-17 18:01:16 +10:00
Rod Persky
e9e4f5d824 match PolyMath.cpp old 
Define -DCATCH_CONFIG_MAIN in src/PolyMath.cpp using the cmake build
 2014-05-17 17:13:14 +10: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
Rod Persky
baaf197fd0 CmakeLists 
playing to try and get catch to build
 2014-05-17 11:48:57 +10:00
Rod Persky
fb29df56e7 Updated CMakeLists.txt 
CMakeLists with prebuild only worked with vs, now using dependency instead. Also findpythoninterp wasn't correcly getting the desired python version, fixed to select python 2.7. Test exec definition also moved around a tad, code is missing catch thouth which is an issue?
 2014-05-17 11:09:50 +10:00
jowr
47bb064717 Playing with CMake... 2014-05-16 13:47:49 +02:00
Rod Persky
89d566a2fc corrected dynamic headers program 
JSON_to_CPP replaced with generate_headers.py. See python-args branch
and #1
 2014-05-16 16:38:37 +10:00