From af0421c437ee4ddbf319d6e18fadf5c8a688d5cb Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Wed, 25 Dec 2024 14:50:35 +0000 Subject: [PATCH] Include correct indi headers (#4025) For the hacky non-installed case, provide dummy headers which redirect to their actual locations. I hope this whole case can be removed soon... Fix #4019 --- plugins/TelescopeControl/src/INDI/INDIConnection.cpp | 6 +++--- plugins/TelescopeControl/src/INDI/INDIConnection.hpp | 4 ++-- plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp | 2 +- .../TelescopeControl/src/INDI/test/testINDIConnection.cpp | 2 +- src/external/CMakeLists.txt | 1 + src/external/fake-indi/libindi/baseclient.h | 1 + src/external/fake-indi/libindi/basedevice.h | 1 + src/external/fake-indi/libindi/inditelescope.h | 1 + 8 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 src/external/fake-indi/libindi/baseclient.h create mode 100644 src/external/fake-indi/libindi/basedevice.h create mode 100644 src/external/fake-indi/libindi/inditelescope.h diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp index afcaa438a1bde..6a11c7de37eb8 100644 --- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp +++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1; diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp index e511f20cb0583..54ced1955c4a7 100644 --- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp +++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp @@ -20,8 +20,8 @@ #define INDICONNECTION_HPP #include -#include -#include +#include +#include #include #include diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp index 967bf127fa8de..97e3721c0c3d6 100644 --- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp +++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp @@ -25,7 +25,7 @@ #include "StelCore.hpp" #include "StelUtils.hpp" -#include +#include #include "INDIControlWidget.hpp" TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString ¶ms): diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp index e9466521bd537..f1cc2402762b4 100644 --- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp +++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp @@ -23,7 +23,7 @@ #include #include "INDIConnection.hpp" -#include +#include void TestINDIConnection::deafultCoordinates() { diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index fa56117659543..203b107f5060d 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -189,6 +189,7 @@ IF(USE_PLUGIN_TELESCOPECONTROL AND ENABLE_INDI) ${indiclient_SOURCE_DIR}/libindi ${indiclient_SOURCE_DIR}/libs PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/fake-indi ${CMAKE_CURRENT_BINARY_DIR} ${indiclient_SOURCE_DIR} ${indiclient_SOURCE_DIR}/libs/sockets diff --git a/src/external/fake-indi/libindi/baseclient.h b/src/external/fake-indi/libindi/baseclient.h new file mode 100644 index 0000000000000..801c20f1b66e8 --- /dev/null +++ b/src/external/fake-indi/libindi/baseclient.h @@ -0,0 +1 @@ +#include "libs/indiclient/baseclient.h" diff --git a/src/external/fake-indi/libindi/basedevice.h b/src/external/fake-indi/libindi/basedevice.h new file mode 100644 index 0000000000000..30242d11c00bd --- /dev/null +++ b/src/external/fake-indi/libindi/basedevice.h @@ -0,0 +1 @@ +#include "libs/indidevice/basedevice.h" diff --git a/src/external/fake-indi/libindi/inditelescope.h b/src/external/fake-indi/libindi/inditelescope.h new file mode 100644 index 0000000000000..f6375c011c59a --- /dev/null +++ b/src/external/fake-indi/libindi/inditelescope.h @@ -0,0 +1 @@ +#include "libs/indibase/inditelescope.h"