From 4ac6aea23e19201b4df941544d8b3f4c323755c0 Mon Sep 17 00:00:00 2001 From: Richard von Lehe Date: Sun, 18 Jan 2015 22:12:44 -0600 Subject: [PATCH] OP-1681 Fix Qwt library debug build naming +review OPReview --- ground/openpilotgcs/src/libs/qwt/src/src.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/libs/qwt/src/src.pro b/ground/openpilotgcs/src/libs/qwt/src/src.pro index 6123541e3..fcdf13f5f 100644 --- a/ground/openpilotgcs/src/libs/qwt/src/src.pro +++ b/ground/openpilotgcs/src/libs/qwt/src/src.pro @@ -19,8 +19,6 @@ include( $${QWT_ROOT}/qwtconfig.pri ) # include( $${QWT_ROOT}/qwtbuild.pri ) # include( $${QWT_ROOT}/qwtfunctions.pri ) -include(../../../openpilotgcslibrary.pri) - # QWT_OUT_ROOT = $${OUT_PWD}/.. TEMPLATE = lib @@ -31,6 +29,12 @@ DEFINES += QWT_LIBRARY # DESTDIR = $${QWT_OUT_ROOT}/lib +# NOTE: The include below must come AFTER the TARGET is +# defined. Otherwise the debug version of the library +# will not have the 'd' suffix it needs. +# +include(../../../openpilotgcslibrary.pri) + contains(QWT_CONFIG, QwtDll) { CONFIG += dll