Attachment #173847 for bug #249345

View | Details | Raw Unified | Return to bug 249345
Collapse All | Expand All

Lines 13-22 Link Here

(-)qtiplot-0.9.7.4.orig/fitPlugins/explin/explin.pro (-4 / +5 lines)
13		13
14	# statically link against GSL in 3rdparty	14	# statically link against GSL in 3rdparty
15	INCLUDEPATH += ../../3rdparty/gsl/include/	15	#INCLUDEPATH += ../../3rdparty/gsl/include/
16	LIBS += ../../3rdparty/gsl/lib/libgsl.a	16	#LIBS += ../../3rdparty/gsl/lib/libgsl.a
17	LIBS += ../../3rdparty/gsl/lib/libgslcblas.a	17	#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
18		18
19	#dynamically link against GSL installed system-wide	19	#dynamically link against GSL installed system-wide
20	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas	20	INCLUDEPATH += /usr/include/gsl
		21	unix:LIBS += $$system(pkg-config --libs gsl)
21		22
22	target.path=/usr/lib$${libsuff}/qtiplot/plugins	23	target.path=/usr/lib$${libsuff}/qtiplot/plugins

Lines 13-22 Link Here

(-)qtiplot-0.9.7.4.orig/fitPlugins/exp_saturation/exp_saturation.pro (-4 / +4 lines)
13		13
14	# statically link against GSL in 3rdparty	14	# statically link against GSL in 3rdparty
15	INCLUDEPATH += ../../3rdparty/gsl/include/	15	#LIBS += ../../3rdparty/gsl/lib/libgsl.a
16	LIBS += ../../3rdparty/gsl/lib/libgsl.a	16	#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
17	LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
18		17
19	#dynamically link against GSL installed system-wide	18	#dynamically link against GSL installed system-wide
20	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas	19	INCLUDEPATH += /usr/include/gsl
		20	unix:LIBS += $$system(pkg-config --libs gsl)
21		21
22	target.path=/usr/lib$${libsuff}/qtiplot/plugins	22	target.path=/usr/lib$${libsuff}/qtiplot/plugins

Lines 13-22 Link Here

(-)qtiplot-0.9.7.4.orig/fitPlugins/fitRational0/fitRational0.pro (-4 / +5 lines)
13		13
14	# statically link against GSL in 3rdparty	14	# statically link against GSL in 3rdparty
15	INCLUDEPATH += ../../3rdparty/gsl/include/	15	#INCLUDEPATH += ../../3rdparty/gsl/include/
16	LIBS += ../../3rdparty/gsl/lib/libgsl.a	16	#LIBS += ../../3rdparty/gsl/lib/libgsl.a
17	LIBS += ../../3rdparty/gsl/lib/libgslcblas.a	17	#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
18		18
19	#dynamically link against GSL installed system-wide	19	#dynamically link against GSL installed system-wide
20	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas	20	INCLUDEPATH += /usr/include/gsl
		21	unix:LIBS += $$system(pkg-config --libs gsl)
21		22
22	target.path=/usr/lib$${libsuff}/qtiplot/plugins	23	target.path=/usr/lib$${libsuff}/qtiplot/plugins

Lines 13-22 Link Here

(-)qtiplot-0.9.7.4.orig/fitPlugins/fitRational1/fitRational1.pro (-4 / +5 lines)
13		13
14	# statically link against GSL in 3rdparty	14	# statically link against GSL in 3rdparty
15	INCLUDEPATH += ../../3rdparty/gsl/include/	15	#INCLUDEPATH += ../../3rdparty/gsl/include/
16	LIBS += ../../3rdparty/gsl/lib/libgsl.a	16	#LIBS += ../../3rdparty/gsl/lib/libgsl.a
17	LIBS += ../../3rdparty/gsl/lib/libgslcblas.a	17	#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
18		18
19	#dynamically link against GSL installed system-wide	19	#dynamically link against GSL installed system-wide
20	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas	20	INCLUDEPATH += /usr/include/gsl
		21	unix:LIBS += $$system(pkg-config --libs gsl)
21		22
22	target.path=/usr/lib$${libsuff}/qtiplot/plugins	23	target.path=/usr/lib$${libsuff}/qtiplot/plugins





# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
CONFIG          += CustomInstall

CONFIG          += release

#############################################################################

INCLUDEPATH       += /usr/include/muparser
INCLUDEPATH       += ../3rdparty/qwtplot3d/include
INCLUDEPATH       += /usr/include/qwt5
INCLUDEPATH       += ../3rdparty/liborigin
INCLUDEPATH       += /usr/include/gsl
INCLUDEPATH       += /usr/include/boost
INCLUDEPATH       += ../3rdparty/boost_1_36_0

##################### 3rd PARTY LIBRARIES SECTION ###########################


# statically link against libraries in 3rdparty
#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
#unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a
#unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a

# dynamically link against dependencies if they are installed system-wide
unix:LIBS         += -lmuparser -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
#unix:LIBS         += -lqwt
#unix:LIBS         += -lgsl -lgslcblas

Return to bug 249345

Lines 21-25 Link Here

(-)qtiplot-0.9.7.4.orig/qtiplot/qtiplot.pro (-15 / +14 lines)
21		21
22	# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.	22	# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
23	#CONFIG += CustomInstall	23	CONFIG += CustomInstall
24		24
25	CONFIG += release	25	CONFIG += release
Lines 31-41 Link Here
31	#############################################################################	31	#############################################################################
32		32
33	INCLUDEPATH += ../3rdparty/muparser/include	33	INCLUDEPATH += /usr/include/muparser
34	INCLUDEPATH += ../3rdparty/qwtplot3d/include	34	INCLUDEPATH += ../3rdparty/qwtplot3d/include
35	INCLUDEPATH += ../3rdparty/qwt/src	35	INCLUDEPATH += /usr/include/qwt5
36	INCLUDEPATH += ../3rdparty/liborigin	36	INCLUDEPATH += ../3rdparty/liborigin
37	INCLUDEPATH += ../3rdparty/gsl/include	37	INCLUDEPATH += /usr/include/gsl
38	INCLUDEPATH += ../3rdparty/zlib123/include	38	INCLUDEPATH += /usr/include/boost
39	INCLUDEPATH += ../3rdparty/boost_1_36_0
40		39
41	##################### 3rd PARTY LIBRARIES SECTION ###########################	40	##################### 3rd PARTY LIBRARIES SECTION ###########################
Lines 46-58 Link Here
46		45
47	# statically link against libraries in 3rdparty	46	# statically link against libraries in 3rdparty
48	unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a	47	#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
49	unix:LIBS += ../3rdparty/qwt/lib/libqwt.a	48	#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
50	unix:LIBS += ../3rdparty/gsl/lib/libgsl.a	49	#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
51	unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a	50	#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
52	unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a	51	#unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a
53	unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a	52	#unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a
54		53
55	# dynamically link against dependencies if they are installed system-wide	54	# dynamically link against dependencies if they are installed system-wide
56	#unix:LIBS += -lmuparser	55	unix:LIBS += -lmuparser -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
57	#unix:LIBS += -lqwt	56	#unix:LIBS += -lqwt
58	#unix:LIBS += -lgsl -lgslcblas	57	#unix:LIBS += -lgsl -lgslcblas