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

[Peter Kümmel]

SVN commit 1161392 by kuemmel:

fix bug in config.pri fot getdata, remove warnings

 M  +1 -1      config.pri  
 M  +2 -2      src/datasources/datasources.pro  
 M  +1 -0      src/datasources/dirfilesource/dirfilesource.pro  


--- branches/work/kst/portto4/kst/config.pri #1161391:1161392
@@ -69,7 +69,7 @@
   !win32:contains(HAVE_DIRFILE, 1) {
     return(true)
   }
-  GETDATADIR= = $$(GETDATADIR)
+  GETDATADIR = $$(GETDATADIR)
   win32:!isEmpty(GETDATADIR) {
     return(true)
   }
--- branches/work/kst/portto4/kst/src/datasources/datasources.pro #1161391:1161392
@@ -17,8 +17,8 @@
 LibExists(getdata) {
     message(DIRFILE configured.  Plugins will be built.)
     SUBDIRS += dirfilesource
-    CONFIG += link_pkgconfig
-    PKGCONFIG += getdata
+    !win32:CONFIG += link_pkgconfig
+    !win32:PKGCONFIG += getdata
 }
 
 LibExists(netcdf) {
--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #1161391:1161392
@@ -1,4 +1,5 @@
 TOPOUT_REL=../../..
+include($$PWD/$$TOPOUT_REL/config.pri)
 include($$PWD/$$TOPOUT_REL/kst.pri)
 include($$PWD/../../../datasourceplugin.pri)