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

[Mike Fenton]

SVN commit 882962 by fenton:

Add option for GSL not being installed.


 M  +4 -1      config.pri  
 M  +8 -4      src/plugins/dataobject/dataobject.pro  
 M  +8 -4      src/plugins/filters/filters.pro  
 M  +20 -17    src/plugins/fits/fits.pro  


--- branches/work/kst/portto4/kst/config.pri #882961:882962
@@ -2,4 +2,7 @@
 HAVE_CFITSIO = 1
 
 #Define if you have dirfile getdata library
-HAVE_DIRFILE = 1
\ No newline at end of file
+HAVE_DIRFILE = 1
+
+#Define if you have the gsl library installed
+HAVE_GSL = 1
\ No newline at end of file
--- branches/work/kst/portto4/kst/src/plugins/dataobject/dataobject.pro #882961:882962
@@ -1,3 +1,4 @@
+include($$PWD/../../../config.pri)
 TEMPLATE = subdirs
 CONFIG += ordered
 
@@ -4,20 +5,23 @@
 SUBDIRS += \
     bin \
     chop \
-    convolution \
-    correlation \
     crossspectrum \
     cumulativesum \
     differentiation \
     effectivebandwidth \
     genericfilter \
-    interpolations \
     linefit \
-    noiseaddition \
     periodogram \
     phase \
     shift \
     statistics \
     syncbin
 
+ contains(HAVE_GSL, 1) {
+     message(GSL configured.  Data Object plugins will be built.)
+     SUBDIRS += convolution \
+                correlation \
+                interpolations \
+                noiseaddition
+ }
 
--- branches/work/kst/portto4/kst/src/plugins/filters/filters.pro #882961:882962
@@ -1,3 +1,4 @@
+include($$PWD/../../../config.pri)
 TEMPLATE = subdirs
 CONFIG += ordered
 
@@ -2,7 +3,10 @@
 SUBDIRS += \
-    butterworth_bandpass \
-    butterworth_bandstop \
-    butterworth_highpass \
-    butterworth_lowpass \
     despike 
 
+ contains(HAVE_GSL, 1) {
+     message(GSL configured.  Filter plugins will be built.)
+     SUBDIRS += butterworth_bandpass \
+                butterworth_bandstop \
+                butterworth_highpass \
+                butterworth_lowpass
+ }
--- branches/work/kst/portto4/kst/src/plugins/fits/fits.pro #882961:882962
@@ -1,20 +1,23 @@
+include($$PWD/../../../config.pri)
 TEMPLATE = subdirs
 CONFIG += ordered
 
-SUBDIRS += \
-    exponential_unweighted \
-    exponential_weighted \
-    gaussian_unweighted \
-    gaussian_weighted \
-    gradient_weighted \
-    gradient_unweighted \
-    kneefrequency \
-    linear_weighted \
-    linear_unweighted \
-    lorentzian_unweighted \
-    lorentzian_weighted \
-    polynomial_unweighted \
-    polynomial_weighted \
-    sinusoid_unweighted \
-    sinusoid_weighted
-
+contains(HAVE_GSL, 1) {
+  message(GSL configured.  Fits plugins will be built.)
+  SUBDIRS += \
+      exponential_unweighted \
+      exponential_weighted \
+      gaussian_unweighted \
+      gaussian_weighted \
+      gradient_weighted \
+      gradient_unweighted \
+      kneefrequency \
+      linear_weighted \
+      linear_unweighted \
+      lorentzian_unweighted \
+      lorentzian_weighted \
+      polynomial_unweighted \
+      polynomial_weighted \
+      sinusoid_unweighted \
+      sinusoid_weighted
+ }