Merge branch 'master' into release

Author: dg0yt

CMakeLists.txt

@@ -23,9 +23,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(FeatureSummary)
 
+if(CCACHE_PROGRAM)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
 # Project declaration
 
-project(Mapper VERSION 0.8.1.2 LANGUAGES CXX C)
+project(Mapper VERSION 0.8.2 LANGUAGES CXX C)
 
 if(Mapper_VERSION_DISPLAY)
 	message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")

INSTALL.md

@@ -19,11 +19,11 @@ components. Direct dependencies are:
  - Clipper library (aka libpolyclipping) >= 6.1.3.a
    http://www.angusj.com/delphi/clipper.php
  - PROJ.4 Cartographic Projections Library >= 4.8
-   http://proj4.org/
+   https://proj4.org/
  - GDAL Geospatial Data Abstraction Library
-   http://www.gdal.org/
+   https://www.gdal.org/
  - ZLib Compression Library
-   http://zlib.net/
+   https://zlib.net/
 
 When building for Linux, you may use the distributions' packages. 
 However, openSUSE is known to lack the Clipper library.
@@ -109,7 +109,7 @@ it needs.
 
 For setting up Kits, see the Qt Creator documentation:
 
-http://doc.qt.io/qtcreator/creator-targets.html
+https://doc.qt.io/qtcreator/creator-targets.html
 
 Starting with Qt Creator 4.3, it might become possible to simply open the
 superbuild's openorienteering-mapper build directory as a regular project

README.md

@@ -1,15 +1,15 @@
 # OpenOrienteering Mapper
 
-![Mapper Screenshot](http://openorienteering.github.io/mapper-manual/pages/images/main_window.png)
+![Mapper Screenshot](https://www.openorienteering.org/mapper-manual/pages/images/main_window.png)
 
 OpenOrienteering Mapper is an orienteering mapmaking program and provides
 a free and open source alternative to existing commercial software.
 OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
 
- - [Mapper Homepage](http://www.openorienteering.org/apps/mapper/)
- - [Manual](http://www.openorienteering.org/mapper-manual/)
+ - [Mapper Homepage](https://www.openorienteering.org/apps/mapper/)
+ - [Manual](https://www.openorienteering.org/mapper-manual/)
  - [Downloads](https://github.com/OpenOrienteering/mapper/releases)
- - [OpenOrienteering Blog](http://www.openorienteering.org/)
+ - [OpenOrienteering Blog](https://www.openorienteering.org/)
 
 
 ## Reporting Issues and Asking for Help
@@ -37,7 +37,7 @@ For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrient
 Pull requests are very welcome.
 
  - [Issue tracker](https://github.com/OpenOrienteering/mapper/issues)
- - [API documentation](http://www.openorienteering.org/api-docs/mapper/)
+ - [API documentation](https://www.openorienteering.org/api-docs/mapper/)
  - [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
 
 

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.1" android:versionCode="801" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.2" android:versionCode="802" package="org.openorienteering.mapper" android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

doc/licensing/CMakeLists.txt

@@ -34,7 +34,7 @@ endforeach()
 
 # Select default provider
 if(ANDROID OR APPLE OR WIN32)
-	set(default_provider superbuild)
+	set(default_provider OFF)
 elseif(UNIX)
 	execute_process(
 	  COMMAND sh -c ". /etc/os-release; echo $ID"

doc/licensing/licensing.html

@@ -31,7 +31,7 @@ <h2 id="openorienteering-mapper">
 </h2>
 <p>
   OpenOrienteering Mapper is a free software for drawing orienteering maps.<br />
-  <a href="http://www.openorienteering.org/apps/mapper/">http://www.openorienteering.org/apps/mapper/</a>
+  <a href="https://www.openorienteering.org/apps/mapper/">https://www.openorienteering.org/apps/mapper/</a>
 </p>
 <p>
   @Mapper_COPYRIGHT@

doc/licensing/opensuse-leap-licensing.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")

doc/licensing/opensuse-licensing.cmake

@@ -1,5 +1,5 @@
 #
-#    Copyright 2017 Kai Pastor
+#    Copyright 2017, 2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -21,10 +21,16 @@
 
 include("linux-distribution.cmake")
 
+find_file (GDAL_LICENSE_TXT
+  NAMES LICENSE.TXT
+  PATHS /usr/share/licenses/gdal-devel
+        /usr/share/doc/packages/gdal-devel
+  NO_DEFAULT_PATH
+)
 set(explicit_copyright_gdal
   # Copy! Package libgdal* does not include this file.
   "gdal.txt"
-  "/usr/share/doc/packages/gdal-devel/LICENSE.TXT"
+  "${GDAL_LICENSE_TXT}"
   "3rd-party"
 )
 

doc/licensing/opensuse-tumbleweed-licensing.cmake

@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")

doc/licensing/src/licensing.qdoc

@@ -26,7 +26,7 @@
 \section1 OpenOrienteering Mapper
 
 \e {OpenOrienteering Mapper is a free software for drawing orienteering maps.} \break
-\l http://openorienteering.org
+\l https://www.openorienteering.org
 
 Copyright (C) 2012-2015 Kai Pastor, Thomas Schöps