Merge branch 'master' of https://github.com/coolprop/coolprop

CMakeLists.txt

@@ -154,6 +154,7 @@ if (COOLPROP_EES_MODULE)
   if (!MSVC)
     set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
   endif()
+  add_dependencies (${app_name} generate_headers)  
 endif()
 
 if (COOLPROP_OCTAVE_MODULE)
@@ -185,7 +186,7 @@ if (COOLPROP_OCTAVE_MODULE)
   SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIB} ${OCTINTERP_LIB} ${CRUFT_LIB})
 
   set_target_properties(CoolProp PROPERTIES SUFFIX ".oct" PREFIX "")
-  
+  add_dependencies (${app_name} generate_headers)  
 endif()
 
 if (COOLPROP_CSHARP_MODULE)
@@ -210,7 +211,7 @@ if (COOLPROP_CSHARP_MODULE)
   if (WIN32)
     set_target_properties(CoolProp PROPERTIES PREFIX "")
   endif()
-  
+  add_dependencies (${app_name} generate_headers)  
 endif()
 
 if (COOLPROP_JAVA_MODULE)
@@ -242,7 +243,7 @@ if (COOLPROP_JAVA_MODULE)
   if (!MSVC)
     set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
   endif()
-  
+  add_dependencies (${app_name} generate_headers)  
 endif()
 
 # NOT WORKING!

dev/generate_headers.py

@@ -17,8 +17,9 @@ def get_hash(data):
 repo_root_path = os.path.normpath(os.path.join(os.path.abspath(__file__),'..','..'))
 
 # Load up the hashes of the data that will be written to each file
-if os.path.exists(os.path.join(repo_root_path,'dev','hashes.json')):
-    hashes = json.load(open('hashes.json','r'))
+hashes_fname = os.path.join(repo_root_path,'dev','hashes.json')
+if os.path.exists(hashes_fname):
+    hashes = json.load(open(hashes_fname,'r'))
 else:
     hashes = dict()
 
@@ -113,7 +114,7 @@ if __name__=='__main__':
 
     # Write the hashes to a hashes JSON file
     if hashes:
-        fp = open(os.path.join(repo_root_path,'dev','hashes.json'),'w')
+        fp = open(hashes_fname,'w')
         fp.write(json.dumps(hashes))
         fp.close()
 

include/crossplatform_shared_ptr.h

@@ -12,8 +12,8 @@ using std::shared_ptr;
 #include <tr1/memory>
 using namespace std::tr1;
 #elif defined(__ISAPPLE__)
-#include <tr1/memory>
-using namespace std::tr1;
+#include <memory>
+using std::shared_ptr;
 #elif defined(__ISWINDOWS__) && defined(__MINGW32__)
 #include <tr1/memory>
 using namespace std::tr1;