From 4d5841e4b11e577355d48d2a54d6e71199e4dcc4 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 16 May 2021 12:27:17 +0100 Subject: [PATCH] Move Boost GeometricTools_BSplineCurve.h to contrib .. it is not our code. --- .../boost}/GeometricTools_BSplineCurve.h | 0 src/src.pro | 13 ++++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) rename {src/FileIO => contrib/boost}/GeometricTools_BSplineCurve.h (100%) diff --git a/src/FileIO/GeometricTools_BSplineCurve.h b/contrib/boost/GeometricTools_BSplineCurve.h similarity index 100% rename from src/FileIO/GeometricTools_BSplineCurve.h rename to contrib/boost/GeometricTools_BSplineCurve.h diff --git a/src/src.pro b/src/src.pro index cad30982b..d9cc6cf2c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -56,8 +56,14 @@ QMAKE_CFLAGS_ISYSTEM = ###======================================================================= # qwt, qxt, libz, json, lmfit and qwtcurve -INCLUDEPATH += ../qwt/src ../contrib/qxt/src ../contrib/qtsolutions/json \ - ../contrib/qtsolutions/qwtcurve ../contrib/lmfit ../contrib/levmar +INCLUDEPATH += ../qwt/src \ + ../contrib/qxt/src \ + ../contrib/qtsolutions/json \ + ../contrib/qtsolutions/qwtcurve \ + ../contrib/lmfit \ + ../contrib/levmar \ + ../contrib/boost + DEFINES += QXT_STATIC # to make sure we are toolchain neutral we NEVER refer to a lib @@ -746,7 +752,8 @@ HEADERS += ../contrib/qtsolutions/codeeditor/codeeditor.h ../contrib/qtsolutions ../contrib/qxt/src/qxtspanslider_p.h ../contrib/qxt/src/qxtstringspinbox.h ../contrib/qzip/zipreader.h \ ../contrib/qzip/zipwriter.h ../contrib/lmfit/lmcurve.h ../contrib/lmfit/lmcurve_tyd.h \ ../contrib/lmfit/lmmin.h ../contrib/lmfit/lmstruct.h \ - ../contrib/levmar/compiler.h ../contrib/levmar/levmar.h ../contrib/levmar/lm.h ../contrib/levmar/misc.h + ../contrib/levmar/compiler.h ../contrib/levmar/levmar.h ../contrib/levmar/lm.h ../contrib/levmar/misc.h \ + ../contrib/boost/GeometricTools_BSplineCurve.h # Train View HEADERS += Train/AddDeviceWizard.h Train/CalibrationData.h Train/ComputrainerController.h Train/Computrainer.h Train/DeviceConfiguration.h \