Satellite plugin:

... and remove a requirement for Qt5 build
Stellarium · Aug 28, 2024 · 92237fc · 92237fc
1 parent 08ed4bf
commit 92237fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
@@ -65,14 +65,14 @@ IF(ENABLE_TESTING)
 ENDIF(ENABLE_TESTING)
 
 ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+TARGET_LINK_LIBRARIES(Satellites-static Qt${QT_VERSION_MAJOR}::Core
+        Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets
+        Qt${QT_VERSION_MAJOR}::GuiPrivate)
 IF(ENABLE_XLSX AND (${SATELLITES_PLUGIN_IRIDIUM} EQUAL "1"))
-    TARGET_LINK_LIBRARIES(Satellites-static Qt${QT_VERSION_MAJOR}::Core
-            Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Concurrent
-	    Qt${QT_VERSION_MAJOR}::GuiPrivate QXlsx::QXlsx)
-ELSE()
-    TARGET_LINK_LIBRARIES(Satellites-static Qt${QT_VERSION_MAJOR}::Core
-            Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Concurrent
-	    Qt${QT_VERSION_MAJOR}::GuiPrivate)
+    TARGET_LINK_LIBRARIES(Satellites-static QXlsx::QXlsx)
+ENDIF()
+IF (${QT_VERSION_MAJOR} EQUAL "6")
+    TARGET_LINK_LIBRARIES(Satellites-static Qt${QT_VERSION_MAJOR}::Concurrent)
 ENDIF()
 # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
 SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")

diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
@@ -60,7 +60,9 @@
 #include <QTemporaryFile>
 #include <QRegularExpression>
 #include <QBuffer>
+#if (QT_VERSION>=QT_VERSION_CHECK(6,0,0))
 #include <QtConcurrent>
+#endif
 
 StelModule* SatellitesStelPluginInterface::getStelModule() const
 {