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

[Peter Kümmel]

SVN commit 1168310 by kuemmel:

Also use include dir from pkg-config, QMAKEFEATURES does not work: configuring with qmake is a PITA.

 M  +8 -0      config.pri  
 M  +2 -0      src/datasources/dirfilesource/dirfilesource.pro  
 M  +6 -0      src/datasources/fitsimage/fitsimage.pro  
 M  +2 -0      src/datasources/netcdf/netcdf.pro  


--- branches/work/kst/portto4/kst/config.pri #1168309:1168310
@@ -89,3 +89,11 @@
 
 
 }
+
+
+defineReplace(pkginclude) {
+    PKGCONFIG_INCLUDE_DIR = $$system(pkg-config --variable includedir $$1)
+    message(Using $$1 headers in $$PKGCONFIG_INCLUDE_DIR)
+    return($$PKGCONFIG_INCLUDE_DIR)
+}
+
--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.pro #1168309:1168310
@@ -11,6 +11,8 @@
 	message(Using GetData C++ binding files from $$(GETDATADIR).)
 	INCLUDEPATH += $$(GETDATADIR)/include
 	LIBS += -L$$(GETDATADIR)/lib
+} else {
+	INCLUDEPATH += $$pkginclude(getdata)
 }
 
 LIBS += -lgetdata++
--- branches/work/kst/portto4/kst/src/datasources/fitsimage/fitsimage.pro #1168309:1168310
@@ -8,6 +8,12 @@
 
 LIBS += -lcfitsio
 
+win32 {
+    
+} else {
+    INCLUDEPATH += $$pkginclude(cfitsio)
+}
+
 SOURCES += \
     fitsimage.cpp
 
--- branches/work/kst/portto4/kst/src/datasources/netcdf/netcdf.pro #1168309:1168310
@@ -11,6 +11,8 @@
 	message(Using netCDF files from $$(NETCDFDIR).)
 	INCLUDEPATH += $$(NETCDFDIR)/include
 	LIBS += -L$$(NETCDFDIR)/lib
+} else {
+	INCLUDEPATH += $$pkginclude(netcdf)
 }
 
 LIBS += -l$$kstlib(netcdf_c++) -l$$kstlib(netcdf)