Revise cove cmake and copyright (GH-1474)

Fix feature activation, actually allow the feature to be activated on Android.
Add cove to feature summary.
Link cove when it is a target.
Pass include dir via target.
Pass WITH_COVE via target.
Display potrace copyright.

Author: dg0yt

3rd-party/cove/CMakeLists.txt

@@ -51,6 +51,8 @@ set(Cove_SRCS
 )
 
 add_library(cove STATIC ${Cove_SRCS})
+target_compile_definitions(cove INTERFACE WITH_COVE)
+target_include_directories(cove INTERFACE AFTER "${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(cove Qt5::Widgets Qt5::Concurrent)
 
 add_subdirectory("tests")

3rd-party/cove/potrace/copyright

@@ -0,0 +1,29 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: potrace
+Source: http://potrace.sourceforge.net/
+
+Files: *
+Copyright: 2001-2005 Peter Selinger <[email protected]>
+License: GPL-2+
+
+Files: copyright
+Copyright: 2003-2018 Bartosz Fenski <[email protected]>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+

CMakeLists.txt

@@ -68,10 +68,12 @@ option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
 
 option(Mapper_USE_GDAL   "Use the GDAL library" ON)
 
-option(Mapper_WITH_COVE "Build and include contour line vectorization" ON)
 if(ANDROID)
-	set(Mapper_WITH_COVE OFF)
+	set(Mapper_WITH_COVE_DEFAULT OFF)
+else()
+	set(Mapper_WITH_COVE_DEFAULT ON)
 endif()
+option(Mapper_WITH_COVE "Build and include contour line vectorization" ${Mapper_WITH_COVE_DEFAULT})
 
 if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo)
 	set(Mapper_DEVELOPMENT_BUILD_DEFAULT OFF)
@@ -258,8 +260,8 @@ add_subdirectory("symbol sets")
 add_subdirectory("translations")
 add_subdirectory("3rd-party/qbezier")
 if(Mapper_WITH_COVE)
+	add_feature_info(Mapper_WITH_COVE "${Mapper_WITH_COVE}" "Contour line vectorization")
 	add_subdirectory("3rd-party/cove")
-	add_definitions(-DWITH_COVE)
 endif()
 if(NOT ANDROID)
 	add_subdirectory("3rd-party/qtsingleapplication")

doc/licensing/CMakeLists.txt

@@ -111,6 +111,9 @@ endif()
 if(Mapper_PACKAGE_ASSISTANT)
 	list(APPEND third_party_components qttools)
 endif()
+if(TARGET cove)
+	list(APPEND third_party_components potrace)
+endif()
 
 message(STATUS "Direct third-party components: ${third_party_components}")
 
@@ -131,6 +134,11 @@ set(explicit_copyright_qtsingleapplication
   "${PROJECT_SOURCE_DIR}/3rd-party/qtsingleapplication/copyright"
   "3rd-party"
 )
+set(explicit_copyright_potrace
+  "potrace-1.6.txt"
+  "${PROJECT_SOURCE_DIR}/3rd-party/cove/potrace/copyright"
+  "3rd-party"
+)
 if(Mapper_BUILD_CLIPPER)
 	set(explicit_copyright_libpolyclipping
 	  "libpolyclipping-${CLIPPER_VERSION}.txt"

src/CMakeLists.txt

@@ -35,9 +35,6 @@ execute_process(
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
 include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-if(Mapper_WITH_COVE)
-	include_directories(AFTER "../3rd-party/cove")
-endif()
 include_directories(AFTER "../3rd-party/qbezier/src") # Always, last
 
 set(Mapper_Common_SRCS
@@ -268,10 +265,8 @@ target_link_libraries(Mapper_Common
   PROJ4::proj
   Qt5::Widgets
 )
-if(Mapper_WITH_COVE)
-	target_link_libraries(Mapper_Common cove)
-endif()
 foreach(lib
+  cove
   mapper-gdal
   mapper-sensors
   printsupport