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

[Peter Kümmel]

SVN commit 1121153 by kuemmel:

Add GSL support on Windows. 

 M  +6 -1      config.pri  
 M  +6 -0      dataobjectplugin.pri  
 A             misc/gsl-windows (directory)  
 AM            misc/gsl-windows/CMakeLists.txt  
 AM            misc/gsl-windows/README.txt  
 AM            misc/gsl-windows/config.h   [License: UNKNOWN]
 AM            misc/gsl-windows/gsl-msvc.patch  
 M  +1 -1      src/plugins/dataobject/convolution/convolve/convolve.pro  
 M  +1 -1      src/plugins/dataobject/convolution/deconvolve/deconvolve.pro  
 M  +1 -1      src/plugins/dataobject/correlation/autocorrelation/autocorrelation.pro  
 M  +1 -1      src/plugins/dataobject/correlation/crosscorrelation/crosscorrelation.pro  
 M  +3 -2      src/plugins/dataobject/dataobject.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/akima/akima.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/akimaperiodic/akimaperiodic.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/cspline/cspline.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/csplineperiodic/csplineperiodic.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/linear/linear.pro  
 M  +1 -1      src/plugins/dataobject/interpolations/polynomial/polynomial.pro  
 M  +1 -1      src/plugins/dataobject/noiseaddition/noiseaddition.pro  
 M  +1 -1      src/plugins/filters/butterworth_bandpass/butterworth_bandpass.pro  
 M  +1 -1      src/plugins/filters/butterworth_bandstop/butterworth_bandstop.pro  
 M  +1 -1      src/plugins/filters/butterworth_highpass/butterworth_highpass.pro  
 M  +2 -1      src/plugins/filters/butterworth_lowpass/butterworth_lowpass.pro  
 M  +1 -1      src/plugins/fits/exponential_unweighted/exponential_unweighted.pro  
 M  +1 -1      src/plugins/fits/exponential_weighted/exponential_weighted.pro  
 M  +2 -2      src/plugins/fits/fits.pro  
 M  +1 -1      src/plugins/fits/gaussian_unweighted/gaussian_unweighted.pro  
 M  +1 -1      src/plugins/fits/gaussian_weighted/gaussian_weighted.pro  
 M  +1 -1      src/plugins/fits/gradient_unweighted/gradient_unweighted.pro  
 M  +1 -1      src/plugins/fits/gradient_weighted/gradient_weighted.pro  
 M  +1 -1      src/plugins/fits/kneefrequency/kneefrequency.pro  
 M  +1 -1      src/plugins/fits/linear_unweighted/linear_unweighted.pro  
 M  +1 -1      src/plugins/fits/linear_weighted/linear_weighted.pro  
 M  +1 -1      src/plugins/fits/lorentzian_unweighted/lorentzian_unweighted.pro  
 M  +1 -1      src/plugins/fits/lorentzian_weighted/lorentzian_weighted.pro  
 M  +1 -1      src/plugins/fits/polynomial_unweighted/polynomial_unweighted.pro  
 M  +1 -1      src/plugins/fits/polynomial_weighted/polynomial_weighted.pro  
 M  +1 -1      src/plugins/fits/sinusoid_unweighted/sinusoid_unweighted.pro  
 M  +1 -1      src/plugins/fits/sinusoid_weighted/sinusoid_weighted.pro  


--- branches/work/kst/portto4/kst/config.pri #1121152:1121153
@@ -46,10 +46,15 @@
   return(true)
 } }
 
+
 contains(lib, gsl) {
-  contains(HAVE_GSL, 1) {
+  GSLDIR = $$(GSLDIR)
+  win32:!isEmpty(GSLDIR) {
     return(true)
   }
+  !win32:contains(HAVE_GSL, 1) {
+    return(true)
+  }
   return(false)
 }
 contains(lib, cfitsio) {
--- branches/work/kst/portto4/kst/dataobjectplugin.pri #1121152:1121153
@@ -1,3 +1,5 @@
+include(config.pri)
+
 QT += xml
 
 TEMPLATE = lib
@@ -27,3 +29,7 @@
 			-l$$kstlib(kst2lib)
 
 
+win32:LibExists(gsl) {
+	INCLUDEPATH += $$(GSLDIR)/include
+	LIBS += -L$$(GSLDIR)/lib
+}
\ No newline at end of file
--- branches/work/kst/portto4/kst/src/plugins/dataobject/convolution/convolve/convolve.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_convolve)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     convolve.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/convolution/deconvolve/deconvolve.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_deconvolve)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     deconvolve.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/correlation/autocorrelation/autocorrelation.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_autocorrelation)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     autocorrelation.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/correlation/crosscorrelation/crosscorrelation.pro #1121152:1121153
@@ -2,7 +2,7 @@
 
 TARGET = $$kstlib(kstplugin_crosscorrelation)
 
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     crosscorrelation.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/dataobject.pro #1121152:1121153
@@ -1,4 +1,5 @@
 include($$PWD/../../../config.pri)
+
 TEMPLATE = subdirs
 CONFIG += ordered
 
@@ -23,6 +24,6 @@
                 correlation \
                 interpolations \
                 noiseaddition
-     CONFIG += link_pkgconfig
-     PKGCONFIG += gsl
+     !win32:CONFIG += link_pkgconfig
+     !win32:PKGCONFIG += gsl
   }
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/akima/akima.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_akima)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     akima.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/akimaperiodic/akimaperiodic.pro #1121152:1121153
@@ -2,7 +2,7 @@
 
 TARGET = $$kstlib(kstplugin_akimaperiodic)
 
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     akimaperiodic.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/cspline/cspline.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_cspline)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     cspline.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/csplineperiodic/csplineperiodic.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_csplineperiodic)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     csplineperiodic.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/linear/linear.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_linearinterpolation)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     linear.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/interpolations/polynomial/polynomial.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../../plugins_subsub.pri)
 
 TARGET = $$kstlib(kstplugin_polynomialinterpolation)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     polynomial.cpp
--- branches/work/kst/portto4/kst/src/plugins/dataobject/noiseaddition/noiseaddition.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_noiseaddition)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     noiseaddition.cpp
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_bandpass/butterworth_bandpass.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_filterbutterworthbandpass)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     butterworth_bandpass.cpp
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_bandstop/butterworth_bandstop.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_filterbutterworthbandstop)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     butterworth_bandstop.cpp
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_highpass/butterworth_highpass.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_filterbutterworthhighpass)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     butterworth_highpass.cpp
--- branches/work/kst/portto4/kst/src/plugins/filters/butterworth_lowpass/butterworth_lowpass.pro #1121152:1121153
@@ -1,7 +1,8 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_filterbutterworthlowpass)
-LIBS += -lgsl -lgslcblas
+LIBS += -l$$kstlib(gsl)
+!win32:LIBS += -l$$kstlib(gsl)cblas
 
 SOURCES += \
     butterworth_lowpass.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/exponential_unweighted/exponential_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitexponential_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitexponential_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/exponential_weighted/exponential_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitexponential_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitexponential_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/fits.pro #1121152:1121153
@@ -21,6 +21,6 @@
       polynomial_weighted \
       sinusoid_unweighted \
       sinusoid_weighted
-    CONFIG += link_pkgconfig
-    PKGCONFIG += gsl
+    !win32:CONFIG += link_pkgconfig
+    !win32:PKGCONFIG += gsl
 }
--- branches/work/kst/portto4/kst/src/plugins/fits/gaussian_unweighted/gaussian_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitgaussian_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitgaussian_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/gaussian_weighted/gaussian_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitgaussian_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitgaussian_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/gradient_unweighted/gradient_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitgradient_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitgradient_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/gradient_weighted/gradient_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitgradient_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitgradient_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/kneefrequency/kneefrequency.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitkneefrequency)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitkneefrequency.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/linear_unweighted/linear_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitlinear_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitlinear_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/linear_weighted/linear_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitlinear_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitlinear_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/lorentzian_unweighted/lorentzian_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitlorentzian_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitlorentzian_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/lorentzian_weighted/lorentzian_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitlorentzian_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitlorentzian_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/polynomial_unweighted/polynomial_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitpolynomial_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitpolynomial_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/polynomial_weighted/polynomial_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitpolynomial_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitpolynomial_weighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_unweighted/sinusoid_unweighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitsinusoid_unweighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitsinusoid_unweighted.cpp
--- branches/work/kst/portto4/kst/src/plugins/fits/sinusoid_weighted/sinusoid_weighted.pro #1121152:1121153
@@ -1,7 +1,7 @@
 include(../../plugins_sub.pri)
 
 TARGET = $$kstlib(kstplugin_fitsinusoid_weighted)
-LIBS += -lgsl
+LIBS += -l$$kstlib(gsl)
 
 SOURCES += \
     fitsinusoid_weighted.cpp