Skip to content

Commit 9008309

Browse files
committed
licensing: Minor fixes
Fix Qt5 SerialPort lookup. Make Qt5 SerialPort a dependency of the Serial NMEA Qt5 Positioning plugin. Allow comma for separating LICENSING_NO_ATTRIBUTION items.
1 parent a9f6bc6 commit 9008309

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

doc/licensing/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,15 @@ if(TARGET Qt5::Positioning)
8888
endif()
8989
if(TARGET Qt5::Sensors)
9090
list(APPEND third_party_components qtsensors)
91+
if(NOT TARGET Qt5::QGeoPositionInfoSourceFactorySerialNmea
92+
AND EXISTS "${Qt5Positioning_DIR}/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake")
93+
include("${Qt5Positioning_DIR}/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake")
94+
endif()
95+
if(TARGET Qt5::QGeoPositionInfoSourceFactorySerialNmea)
96+
find_package(Qt5SerialPort QUIET)
97+
endif()
9198
endif()
92-
if(TARGET Qt5::Serialport)
99+
if(TARGET Qt5::SerialPort)
93100
list(APPEND third_party_components qtserialport)
94101
endif()
95102
if(TARGET QtSingleApplication)
@@ -105,6 +112,8 @@ if(Mapper_PACKAGE_ASSISTANT)
105112
list(APPEND third_party_components qttools)
106113
endif()
107114

115+
message(STATUS "Direct third-party components: ${third_party_components}")
116+
108117

109118
# Licences used directly by Mapper
110119
set(common_license_names
@@ -193,6 +202,7 @@ endforeach()
193202

194203
list(SORT third_party_components)
195204
if(LICENSING_NO_ATTRIBUTION)
205+
string(REPLACE "," ";" LICENSING_NO_ATTRIBUTION "${LICENSING_NO_ATTRIBUTION}")
196206
list(REMOVE_ITEM third_party_components ${LICENSING_NO_ATTRIBUTION})
197207
endif()
198208
list(REMOVE_DUPLICATES third_party_components)

0 commit comments

Comments
 (0)