Change the way subproject includes files.

przemek83 · Nov 29, 2024 · 5fdf57e · 5fdf57e
1 parent 9a06f6c
commit 5fdf57e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/CMakeLists.txt.qwt b/CMakeLists.txt.qwt
@@ -8,7 +8,7 @@ ExternalProject_Add(qwt
     PREFIX qwt
     GIT_REPOSITORY https://git.code.sf.net/p/qwt/git
     GIT_TAG 9e554a5e03bc3a1fe379bdddfa4d21ced2ed7995
-    UPDATE_COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/qwt_preconfigure.cmake"
+    UPDATE_COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/qwt_preconfigure.cmake"
     CONFIGURE_COMMAND qmake "${CMAKE_CURRENT_BINARY_DIR}/qwt/qwt/src/qwt/qwt.pro"
     BUILD_COMMAND "@QWT_BUILD_COMMAND@"
     INSTALL_COMMAND ""

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(PROJECT_TEST ${PROJECT_NAME}-example)
 
-include_directories(${CMAKE_SOURCE_DIR})
+include_directories($<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
 
 set(${PROJECT_TEST}_SOURCES
     example.cpp

diff --git a/examples/example.cpp b/examples/example.cpp
@@ -6,15 +6,13 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include <src/BasicDataPlot.h>
-#include <src/GroupPlot.h>
-#include <src/GroupPlotUI.h>
-#include <src/HistogramPlot.h>
-#include <src/HistogramPlotUI.h>
-#include <src/PlotBase.h>
-#include <src/QuantilesPlot.h>
-#include <src/QwtBleUtilities.h>
-#include <src/Quantiles.h>
+#include "BasicDataPlot.h"
+#include "GroupPlot.h"
+#include "GroupPlotUI.h"
+#include "HistogramPlot.h"
+#include "HistogramPlotUI.h"
+#include "Quantiles.h"
+#include "QuantilesPlot.h"
 
 static QVector<QVector<double>> exampleValues{
     {3.5, 6.7, 4.7, 6.6, 3., 4.9},
@@ -132,7 +130,8 @@ static GroupPlotUI* createGroupPlotUI()
     auto* groupPlotUI = new GroupPlotUI(stringColumns);
     QObject::connect(
         groupPlotUI, &GroupPlotUI::traitIndexChanged, groupPlotUI,
-        [=](int column) {
+        [=](int column)
+        {
             const QVector<QString>& names =
                 (column == 0 ? exampleNames : otherExampleNames);
             const QVector<Quantiles>& quantiles =

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(PROJECT_TEST ${PROJECT_NAME}-test )
 
-include_directories(${CMAKE_SOURCE_DIR})
+include_directories($<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
 
 set(${PROJECT_TEST}_SOURCES
     Tests.cpp

diff --git a/test/GroupPlotUITest.cpp b/test/GroupPlotUITest.cpp
@@ -4,7 +4,7 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <src/GroupPlotUI.h>
+#include "GroupPlotUI.h"
 
 void GroupPlotUITest::testTraitChange()
 {

diff --git a/test/QuantilesTest.cpp b/test/QuantilesTest.cpp
@@ -3,7 +3,7 @@
 #include <QRegularExpression>
 #include <QTest>
 
-#include <src/Quantiles.h>
+#include "Quantiles.h"
 
 void QuantilesTest::testToolTip()
 {

diff --git a/test/UtilitiesTest.cpp b/test/UtilitiesTest.cpp
@@ -2,7 +2,7 @@
 
 #include <QTest>
 
-#include <src/QwtBleUtilities.h>
+#include "QwtBleUtilities.h"
 
 void UtilitiesTest::testStringFromDays()
 {