Skip to content

Commit

Permalink
licensing: Minor fixes
Browse files Browse the repository at this point in the history
Fix Qt5 SerialPort lookup. Make Qt5 SerialPort a dependency of the
Serial NMEA Qt5 Positioning plugin.
Allow comma for separating LICENSING_NO_ATTRIBUTION items.
  • Loading branch information
dg0yt committed Aug 20, 2019
1 parent a9f6bc6 commit 9008309
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion doc/licensing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,15 @@ if(TARGET Qt5::Positioning)
endif()
if(TARGET Qt5::Sensors)
list(APPEND third_party_components qtsensors)
if(NOT TARGET Qt5::QGeoPositionInfoSourceFactorySerialNmea
AND EXISTS "${Qt5Positioning_DIR}/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake")
include("${Qt5Positioning_DIR}/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake")
endif()
if(TARGET Qt5::QGeoPositionInfoSourceFactorySerialNmea)
find_package(Qt5SerialPort QUIET)
endif()
endif()
if(TARGET Qt5::Serialport)
if(TARGET Qt5::SerialPort)
list(APPEND third_party_components qtserialport)
endif()
if(TARGET QtSingleApplication)
Expand All @@ -105,6 +112,8 @@ if(Mapper_PACKAGE_ASSISTANT)
list(APPEND third_party_components qttools)
endif()

message(STATUS "Direct third-party components: ${third_party_components}")


# Licences used directly by Mapper
set(common_license_names
Expand Down Expand Up @@ -193,6 +202,7 @@ endforeach()

list(SORT third_party_components)
if(LICENSING_NO_ATTRIBUTION)
string(REPLACE "," ";" LICENSING_NO_ATTRIBUTION "${LICENSING_NO_ATTRIBUTION}")
list(REMOVE_ITEM third_party_components ${LICENSING_NO_ATTRIBUTION})
endif()
list(REMOVE_DUPLICATES third_party_components)
Expand Down

0 comments on commit 9008309

Please sign in to comment.