[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1131576 by kuemmel:

Add netCDF 3 support for Windows.

 M  +12 -0     config.pri  
 A             misc/netcdf-windows (directory)  
 AM            misc/netcdf-windows/CMakeLists.txt  
 AM            misc/netcdf-windows/README.txt  
 AM            misc/netcdf-windows/config.h   [License: UNKNOWN]
 A             misc/netcdf-windows/cxx (directory)  
 AM            misc/netcdf-windows/cxx/CMakeLists.txt  
 AM            misc/netcdf-windows/inttypes.h   [License: BSD]
 A             misc/netcdf-windows/libsrc (directory)  
 AM            misc/netcdf-windows/libsrc/CMakeLists.txt  
 AM            misc/netcdf-windows/stdint.h   [License: BSD]
 M  +3 -3      src/datasources/datasources.pro  
 M  +8 -1      src/datasources/netcdf/netcdf.pro  


--- branches/work/kst/portto4/kst/config.pri #1131575:1131576
@@ -69,4 +69,16 @@
   }
   return(false)
 }
+contains(lib, netcdf) {
+  NETCDFDIR = $$(NETCDFDIR)
+  win32:!isEmpty(NETCDFDIR) {
+    return(true)
 }
+  !win32:contains(HAVE_NETCDFDIR, 1) {
+    return(true)
+  }
+  return(false)
+}
+
+
+}
--- branches/work/kst/portto4/kst/src/datasources/datasources.pro #1131575:1131576
@@ -21,10 +21,10 @@
     PKGCONFIG += getdata
 }
 
-!win32:LibExists(netcdf) {
+LibExists(netcdf) {
     message(netCDF configured.  Plugins will be built.)
     SUBDIRS += netcdf
-    CONFIG += link_pkgconfig
-    PKGCONFIG += netcdf
+    !win32:CONFIG += link_pkgconfig
+    !win32:PKGCONFIG += netcdf
 }
 
--- branches/work/kst/portto4/kst/src/datasources/netcdf/netcdf.pro #1131575:1131576
@@ -1,4 +1,5 @@
 TOPOUT_REL=../../..
+include($$PWD/$$TOPOUT_REL/config.pri)
 include($$PWD/$$TOPOUT_REL/kst.pri)
 include($$PWD/../../../datasourceplugin.pri)
 
@@ -6,8 +7,14 @@
 
 INCLUDEPATH += $$OUTPUT_DIR/src/datasources/netcdf/tmp
 
-LIBS += -lnetcdf -lnetcdf_c++
+win32{
+	message(Using netCDF files from $$(NETCDFDIR).)
+	INCLUDEPATH += $$(NETCDFDIR)/include
+	LIBS += -L$$(NETCDFDIR)/lib
+}
 
+LIBS += -l$$kstlib(netcdf) -l$$kstlib(netcdf_c++)
+
 SOURCES += \
     kstnetcdf.cpp