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

[Peter Kümmel]

SVN commit 1157304 by kuemmel:

DirFile: first version of using GetData on Windows, only possible with mingw.
Not tested: plugin compiles and links only.

 M  +8 -1      config.pri  
 A             misc/getdata-windows (directory)  
 AM            misc/getdata-windows/README.txt  
 A             misc/getdata-windows/cmake (directory)  
 AM            misc/getdata-windows/cmake/CMakeLists.txt  
 A             misc/getdata-windows/cmake/bindings (directory)  
 AM            misc/getdata-windows/cmake/bindings/CMakeLists.txt  
 A             misc/getdata-windows/cmake/bindings/cxx (directory)  
 AM            misc/getdata-windows/cmake/bindings/cxx/CMakeLists.txt  
 AM            misc/getdata-windows/cmake/inttypes.h   [License: BSD]
 A             misc/getdata-windows/cmake/src (directory)  
 AM            misc/getdata-windows/cmake/src/CMakeLists.txt  
 AM            misc/getdata-windows/mingw.patch  
 AM            misc/getdata-windows/msvc.patch  
 M  +7 -0      src/datasources/dirfilesource/dirfilesource.pro  


--- branches/work/kst/portto4/kst/config.pri #1157303:1157304
@@ -57,18 +57,25 @@
   }
   return(false)
 }
+
 contains(lib, cfitsio) {
   contains(HAVE_CFITSIO, 1) {
     return(true)
   }
   return(false)
 }
+
 contains(lib, getdata) {
-  contains(HAVE_DIRFILE, 1) {
+  !win32:contains(HAVE_DIRFILE, 1) {
     return(true)
   }
+  GETDATADIR= = $$(GETDATADIR)
+  win32:!isEmpty(GETDATADIR) {
+    return(true)
+  }
   return(false)
 }
+
 contains(lib, netcdf) {
   NETCDFDIR = $$(NETCDFDIR)
   win32:!isEmpty(NETCDFDIR) {
--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #1157303:1157304
@@ -6,7 +6,14 @@
 
 INCLUDEPATH += $$OUTPUT_DIR/src/datasources/dirfilesource/tmp
 
+win32{
+	message(Using GetData C++ binding files from $$(GETDATADIR).)
+	INCLUDEPATH += $$(GETDATADIR)/include
+	LIBS += -L$$(GETDATADIR)/lib
+}
+
 LIBS += -lgetdata++
+win32:LIBS += -lgetdata
 
 SOURCES += \
     dirfilesource.cpp