From 4ca86c441de537b7d4901fa283f8e13c1f44876e Mon Sep 17 00:00:00 2001 From: "Patrick J. McNerthney" Date: Tue, 6 Apr 2010 16:10:31 -1000 Subject: [PATCH] Enhanced src/src.pro to detect the standard Debian/Ubuntu install set up of qwtplot3d and use that if QWT3D_INSTALL is not defined. --- src/src.pro | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/src.pro b/src/src.pro index a35ea7240..9b6b107f8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -24,13 +24,21 @@ LIBS += -lm SOURCES += SrmDevice.cpp } -!isEmpty( QWT3D_INSTALL) { - INCLUDEPATH += $${QWT3D_INSTALL}/include - LIBS += $${QWT3D_INSTALL}/lib/libqwtplot3d.a - QT += opengl - HEADERS += ModelPlot.h ModelWindow.h - SOURCES += ModelPlot.cpp ModelWindow.cpp - DEFINES += GC_HAVE_QWTPLOT3D +!isEmpty( QWT3D_INSTALL ) { + INCLUDEPATH += $${QWT3D_INSTALL}/include + LIBS += $${QWT3D_INSTALL}/lib/libqwtplot3d.a + CONFIG += qwt3d +} +isEmpty( QWT3D_INSTALL ):linux-g++:exists( /usr/include/qwtplot3d-qt4 ):exists( /usr/lib/libqwtplot3d-qt4.so ) { + INCLUDEPATH += /usr/include/qwtplot3d-qt4 + LIBS += /usr/lib/libqwtplot3d-qt4.so + CONFIG += qwt3d +} +qwt3d { + QT += opengl + HEADERS += ModelPlot.h ModelWindow.h + SOURCES += ModelPlot.cpp ModelWindow.cpp + DEFINES += GC_HAVE_QWTPLOT3D } macx {