Changeset 8701

Timestamp:

Feb 15, 2013, 3:24:59 PM (12 years ago)

Author:

steve

Message:

Still working on netcsf lib and include files

File:

• trunk/anuga_core/source/anuga/utilities/compile.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -11 +11 @@
 """     
 
+
+
+import os, string, sys
+
+NETCDF_LIB_DIR = os.getenv('NETCDF_LIB_DIR', '')
+NETCDF_INCLUDE_DIR = os.getenv('NETCDF_INCLUDE_DIR', '')
+
+#print 'NETCDF_LIB_DIR: ',NETCDF_LIB_DIR
+#print 'NETCDF_INCLUDE_DIR: ',NETCDF_INCLUDE_DIR
+
+I_dirs = ''
+if NETCDF_INCLUDE_DIR != '' :
+    I_dirs = '-I"%s" ' % NETCDF_INCLUDE_DIR
+
+netcdf_lib_dirs = ''
+if NETCDF_LIB_DIR != '' :
+    netcdf_lib_dirs = '-L"%s" ' % NETCDF_LIB_DIR
+
 #NumPy ------------------------------------
 # Something like these lines recommended in "Converting from NUMARRAY to NUMPY"
 import numpy
-I_dirs = '-I"%s" ' % numpy.get_include()
+I_dirs = I_dirs + '-I"%s" ' % numpy.get_include()
 #NumPy ------------------------------------
 
@@ -20 +38 @@
 # it has only really been used with gcc.
 
-import os, string, sys
-
-NETCDF_LIB_DIR = os.getenv('NETCDF_LIB_DIR', '')
-NETCDF_INCLUDE_DIR = os.getenv('NETCDF_INCLUDE_DIR', '')
-
-print 'NETCDF_LIB_DIR ',NETCDF_LIB_DIR
-print 'NETCDF_INCLUDE_DIR ',NETCDF_INCLUDE_DIR
 
 separation_line = '---------------------------------------'      
@@ -305 +316 @@
       raise Exception('Could not compile %s - please try manually' %FN)
 
-  
+
+
+  libs = libs + netcdf_lib_dirs
+
   # Make shared library (*.so or *.dll)
   if FN=="fitsmooth.c":
+    libs = libs + netcdf_lib_dirs
     if sys.platform == 'win32':   
       if libs is "":