Skip to content
Commits on Source (6)
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 240a96f1
......@@ -21,7 +21,7 @@ endif()
# Define project name and version tags
###############################################################################################
# this is not only the QMS version it will be the package version, too.
project(QMapShack VERSION 1.12.3)
project(QMapShack VERSION 1.13.0)
# FOR A RELEASE:
# remove "development" for a release
......@@ -86,7 +86,7 @@ if (APPLE)
endif(APPLE)
if(WIN32)
set(QT_DEV_PATH "C:\\Qt5\\5.12.1\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.11.1\\msvc2017_64")
set(QT_DEV_PATH "C:\\Qt5\\5.12.1\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.12.1\\msvc2017_64")
set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
......@@ -135,10 +135,10 @@ find_package(Qt5Network REQUIRED)
find_package(Qt5WebEngineWidgets REQUIRED)
find_package(Qt5Qml REQUIRED)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(PROJ4 REQUIRED)
find_package(JPEG REQUIRED)
find_package(ROUTINO REQUIRED)
find_package(QuaZip REQUIRED)
find_package(QuaZip5 REQUIRED)
find_package(ALGLIB ) # optional as we can use our local version
......@@ -146,6 +146,10 @@ if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0)
message( SEND_ERROR "You need at least Qt5.8 or newer.")
endif()
if(${PROJ4_VERSION} VERSION_LESS 5.0.0)
message( SEND_ERROR "You need at least PROJ4 5.0.0 or newer.")
endif()
if(USE_QT5DBus)
find_package(Qt5DBus REQUIRED)
if(Qt5DBus_FOUND)
......@@ -167,6 +171,8 @@ if(NOT ALGLIB_FOUND AND BUILD_QMAPSHACK)
add_subdirectory(3rdparty/alglib)
endif(NOT ALGLIB_FOUND AND BUILD_QMAPSHACK)
add_definitions(-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
###############################################################################################
# Create global config.h
###############################################################################################
......
CMakeLists.txt.user
View file @ 240a96f1
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.8.0, 2019-02-08T16:39:21. -->
<!-- Written by QtCreator 4.8.2, 2019-04-08T18:02:28. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
......@@ -71,7 +71,7 @@
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<valuelist type="QVariantList" key="CMake.Configuration">
<value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>
<value type="QString">BUILD_QMAPTOOL:BOOL=OFF</value>
<value type="QString">BUILD_QMAPTOOL:BOOL=ON</value>
<value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
<value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
<value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
......@@ -509,7 +509,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.6">
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
......@@ -565,7 +565,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.7">
<value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
......@@ -621,7 +621,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/oeichler/Code/cpp/build_QMapShack/bin</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">8</value>
</valuemap>
......
changelog.txt
View file @ 240a96f1
V 1.13.0
[Issue #298] Live GPS data
[Issue #430] Add waypoint summary to project details
[Issue #436] Route history is buggy and causes data loss when auto-routing is enabled
[Issue #433] Suppress ascent/descent if wrong
[Issue #438] Partially: Support for PROJ 6.0.0
[Issue #429] Add Geocaching Attributes
[Issue #434] Mega-fancy tour description on screen
[Issue #448] Project Details: Add track points with additional information to lists
[Issue #443] Garmin Map: Fixing elevation marks
[Issue #450] Waypoint: copy coordinate to clipboard
V 1.12.3
[Issue #428] natural=water not shown
......
cmake/Modules/FindDMTX.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find DMTX
# Once done this will define
#
# DMTX_FOUND - system has DMTX
# DMTX_INCLUDE_DIRS - the DMTX include directory
# DMTX_LIBRARIES - Link these to use DMTX
# DMTX_DEFINITIONS - Compiler switches required for using DMTX
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (DMTX_LIBRARIES AND DMTX_INCLUDE_DIRS)
# in cache already
set(DMTX_FOUND TRUE)
else (DMTX_LIBRARIES AND DMTX_INCLUDE_DIRS)
find_path(DMTX_INCLUDE_DIRS
NAMES
dmtx.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/libdmtx
/usr/local/include/libdmtx
/opt/local/include/libdmtx
/sw/include/libdmtx
../../tools/libdmtx
)
# debian uses version suffixes
# add suffix evey new release
find_library(DMTX_LIBRARIES
NAMES
if (WIN32)
libdmtx
else (WIN32)
dmtx
endif (WIN32)
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
../../tools/libdmtx
)
if (DMTX_INCLUDE_DIRS AND DMTX_LIBRARIES)
set(DMTX_FOUND TRUE)
endif (DMTX_INCLUDE_DIRS AND DMTX_LIBRARIES)
if (DMTX_FOUND)
if (NOT DMTX_FIND_QUIETLY)
message(STATUS "Found DMTX: ${DMTX_LIBRARIES}")
endif (NOT DMTX_FIND_QUIETLY)
else (DMTX_FOUND)
if (DMTX_FIND_REQUIRED)
message(FATAL_ERROR "Could not find DMTX")
endif (DMTX_FIND_REQUIRED)
endif (DMTX_FOUND)
# show the DMTX_INCLUDE_DIRS and DMTX_LIBRARIES variables only in the advanced view
mark_as_advanced(DMTX_INCLUDE_DIRS DMTX_LIBRARIES)
endif (DMTX_LIBRARIES AND DMTX_INCLUDE_DIRS)
cmake/Modules/FindEXIF.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find EXIF
# Once done this will define
#
# EXIF_FOUND - system has EXIF
# EXIF_INCLUDE_DIRS - the EXIF include directory
# EXIF_LIBRARIES - Link these to use EXIF
# EXIF_DEFINITIONS - Compiler switches required for using EXIF
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (EXIF_LIBRARIES AND EXIF_INCLUDE_DIRS)
# in cache already
set(EXIF_FOUND TRUE)
else (EXIF_LIBRARIES AND EXIF_INCLUDE_DIRS)
find_path(EXIF_INCLUDE_DIRS
NAMES
exif-data.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/libexif
/usr/local/include/libexif
/opt/local/include/libexif
/sw/include/libexif
)
# debian uses version suffixes
# add suffix evey new release
find_library(EXIF_LIBRARIES
NAMES
exif
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
if (EXIF_INCLUDE_DIRS AND EXIF_LIBRARIES)
set(EXIF_FOUND TRUE)
endif (EXIF_INCLUDE_DIRS AND EXIF_LIBRARIES)
if (EXIF_FOUND)
if (NOT EXIF_FIND_QUIETLY)
message(STATUS "Found EXIF: ${EXIF_LIBRARIES}")
endif (NOT EXIF_FIND_QUIETLY)
else (EXIF_FOUND)
if (EXIF_FIND_REQUIRED)
message(FATAL_ERROR "Could not find EXIF")
endif (EXIF_FIND_REQUIRED)
endif (EXIF_FOUND)
# show the EXIF_INCLUDE_DIRS and EXIF_LIBRARIES variables only in the advanced view
mark_as_advanced(EXIF_INCLUDE_DIRS EXIF_LIBRARIES)
endif (EXIF_LIBRARIES AND EXIF_INCLUDE_DIRS)
if (WIN32)
set(EXIF_FOUND TRUE)
set(EXIF_LIBRARIES "")
set(EXIF_INCLUDE_DIRS "")
endif (WIN32)
cmake/Modules/FindGDAL.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find GDAL
# Once done this will define
#
# GDAL_FOUND - system has GDAL
# GDAL_INCLUDE_DIRS - the GDAL include directory
# GDAL_LIBRARIES - Link these to use GDAL
# GDAL_DEFINITIONS - Compiler switches required for using GDAL
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (GDAL_LIBRARIES AND GDAL_INCLUDE_DIRS)
# in cache already
set(GDAL_FOUND TRUE)
else (GDAL_LIBRARIES AND GDAL_INCLUDE_DIRS)
find_path(GDAL_INCLUDE_DIR
NAMES
gdal.h
PATHS
if(WIN32)
${GDAL_DEV_PATH}/include
endif(WIN32)
/usr/include
/usr/local/include
/opt/local/include
/sw/include
${CMAKE_INSTALL_PREFIX}/include
/usr/include/gdal
/usr/local/include/gdal
/opt/local/include/gdal
/sw/include/gdal
${CMAKE_INSTALL_PREFIX}/include/gdal
${CMAKE_SOURCE_DIR}/Win32/GDAL/include
PATH_SUFFIXES
gdal
)
# debian uses version suffixes
# add suffix evey new release
find_library(GDAL_LIBRARY
NAMES
gdal
gdal1.3.2
gdal1.4.0
gdal1.5.0
gdal1.6.0
gdal1.7.0
gdal1.8.0
gdal
gdal_i
PATHS
if(WIN32)
${GDAL_DEV_PATH}/lib
endif(WIN32)
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_SOURCE_DIR}/Win32/GDAL/lib
)
set(GDAL_INCLUDE_DIRS
${GDAL_INCLUDE_DIR}
)
set(GDAL_LIBRARIES
${GDAL_LIBRARY}
)
if (GDAL_INCLUDE_DIRS AND GDAL_LIBRARIES)
set(GDAL_FOUND TRUE)
endif (GDAL_INCLUDE_DIRS AND GDAL_LIBRARIES)
if (GDAL_FOUND)
if (NOT GDAL_FIND_QUIETLY)
message(STATUS "Found GDAL: ${GDAL_LIBRARIES}")
endif (NOT GDAL_FIND_QUIETLY)
else (GDAL_FOUND)
if (GDAL_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GDAL")
endif (GDAL_FIND_REQUIRED)
endif (GDAL_FOUND)
# show the GDAL_INCLUDE_DIRS and GDAL_LIBRARIES variables only in the advanced view
mark_as_advanced(GDAL_INCLUDE_DIRS GDAL_LIBRARIES)
endif (GDAL_LIBRARIES AND GDAL_INCLUDE_DIRS)
cmake/Modules/FindGPSD.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find GPSD
# Once done this will define
#
# GPSD_FOUND - system has GPSD
# GPSD_INCLUDE_DIRS - the GPSD include directory
# GPSD_LIBRARIES - Link these to use GPSD
# GPSD_DEFINITIONS - Compiler switches required for using GPSD
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (GPSD_LIBRARIES AND GPSD_INCLUDE_DIRS)
# in cache already
set(GPSD_FOUND TRUE)
else (GPSD_LIBRARIES AND GPSD_INCLUDE_DIRS)
find_path(GPSD_INCLUDE_DIRS
NAMES
gps.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/gps
/usr/local/include/gps
/opt/local/include/gps
/sw/include/gps
)
# debian uses version suffixes
# add suffix evey new release
find_library(GPSD_LIBRARIES
NAMES
gps
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
if (GPSD_INCLUDE_DIRS AND GPSD_LIBRARIES)
set(GPSD_FOUND TRUE)
endif (GPSD_INCLUDE_DIRS AND GPSD_LIBRARIES)
if (GPSD_FOUND)
if (NOT GPSD_FIND_QUIETLY)
message(STATUS "Found GPSD: ${GPSD_LIBRARIES}")
endif (NOT GPSD_FIND_QUIETLY)
else (GPSD_FOUND)
if (GPSD_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GPSD")
endif (GPSD_FIND_REQUIRED)
endif (GPSD_FOUND)
# show the GPSD_INCLUDE_DIRS and GPSD_LIBRARIES variables only in the advanced view
mark_as_advanced(GPSD_INCLUDE_DIRS GPSD_LIBRARIES)
endif (GPSD_LIBRARIES AND GPSD_INCLUDE_DIRS)
if (WIN32)
set(GPSD_FOUND FALSE)
set(GPSD_LIBRARIES "")
set(GPSD_INCLUDE_DIRS "")
endif (WIN32)
cmake/Modules/FindJPEG.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find LIBJPEG
# Once done this will define
#
# JPEG_FOUND - system has LIBJPEG
# JPEG_INCLUDE_DIRS - the LIBJPEG include directory
# JPEG_LIBRARIES - Link these to use LIBJPEG
# JPEG_DEFINITIONS - Compiler switches required for using LIBJPEG
#
# Copyright (c) 2009 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# NOTE: For Windows, please adapt the path (currently E:/qlgt/tools/libjpeg/win32)
# to your local installation directory
if (JPEG_LIBRARIES AND JPEG_INCLUDE_DIRS)
# in cache already
set(JPEG_FOUND TRUE)
else (JPEG_LIBRARIES AND JPEG_INCLUDE_DIRS)
find_path(JPEG_INCLUDE_DIR
NAMES
jpeglib.h
PATHS
if(WIN32)
${JPEG_DEV_PATH}/include
endif(WIN32)
/usr/include
/usr/local/include
/opt/local/include
/sw/include
${CMAKE_SOURCE_DIR}/Win32/JPEG/include
)
mark_as_advanced(JPEG_INCLUDE_DIR)
find_library(LIBJPEG_LIBRARY
NAMES
if (WIN32)
libjpeg
else (WIN32)
jpeg
endif (WIN32)
PATHS
if(WIN32)
${JPEG_DEV_PATH}/lib
endif(WIN32)
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
${CMAKE_SOURCE_DIR}/Win32/JPEG/lib
)
mark_as_advanced(LIBJPEG_LIBRARY)
if (LIBJPEG_LIBRARY)
set(LIBJPEG_FOUND TRUE)
endif (LIBJPEG_LIBRARY)
set(JPEG_INCLUDE_DIRS
${JPEG_INCLUDE_DIR}
)
if (LIBJPEG_FOUND)
set(JPEG_LIBRARIES
${JPEG_LIBRARIES}
${LIBJPEG_LIBRARY}
)
endif (LIBJPEG_FOUND)
if (JPEG_INCLUDE_DIRS AND JPEG_LIBRARIES)
set(JPEG_FOUND TRUE)
endif (JPEG_INCLUDE_DIRS AND JPEG_LIBRARIES)
if (JPEG_FOUND)
if (NOT JPEG_FIND_QUIETLY)
message(STATUS "Found LIBJPEG: ${JPEG_LIBRARIES}")
endif (NOT JPEG_FIND_QUIETLY)
else (JPEG_FOUND)
if (JPEG_FIND_REQUIRED)
message(FATAL_ERROR "Could not find LIBJPEG")
endif (JPEG_FIND_REQUIRED)
endif (JPEG_FOUND)
# show the JPEG_INCLUDE_DIRS and JPEG_LIBRARIES variables only in the advanced view
mark_as_advanced(JPEG_INCLUDE_DIRS JPEG_LIBRARIES)
endif (JPEG_LIBRARIES AND JPEG_INCLUDE_DIRS)
cmake/Modules/FindPROJ.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find PROJ
# Once done this will define
#
# PROJ_FOUND - system has PROJ
# PROJ_INCLUDE_DIRS - the PROJ include directory
# PROJ_LIBRARIES - Link these to use PROJ
# PROJ_DEFINITIONS - Compiler switches required for using PROJ
#
# Copyright (c) 2009 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (PROJ_LIBRARIES AND PROJ_INCLUDE_DIRS)
# in cache already
set(PROJ_FOUND TRUE)
else (PROJ_LIBRARIES AND PROJ_INCLUDE_DIRS)
find_path(PROJ_INCLUDE_DIR
NAMES
proj_api.h
PATHS
if(WIN32)
${PROJ_DEV_PATH}/include
endif(WIN32)
/usr/include
/usr/local/include
/opt/local/include
/sw/include
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_SOURCE_DIR}/Win32/GDAL/include
PATH_SUFFIXES
proj4
)
mark_as_advanced(PROJ_INCLUDE_DIR)
find_library(LIBPROJ_LIBRARY
NAMES
proj
proj_i
PATHS
if(WIN32)
${PROJ_DEV_PATH}/lib
endif(WIN32)
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_SOURCE_DIR}/Win32/GDAL/lib
)
mark_as_advanced(LIBPROJ_LIBRARY)
if (LIBPROJ_LIBRARY)
set(LIBPROJ_FOUND TRUE)
endif (LIBPROJ_LIBRARY)
set(PROJ_INCLUDE_DIRS
${PROJ_INCLUDE_DIR}
)
if (LIBPROJ_FOUND)
set(PROJ_LIBRARIES
${PROJ_LIBRARIES}
${LIBPROJ_LIBRARY}
)
endif (LIBPROJ_FOUND)
if (PROJ_INCLUDE_DIRS AND PROJ_LIBRARIES)
set(PROJ_FOUND TRUE)
endif (PROJ_INCLUDE_DIRS AND PROJ_LIBRARIES)
if (PROJ_FOUND)
if (NOT PROJ_FIND_QUIETLY)
message(STATUS "Found PROJ: ${PROJ_LIBRARIES}")
endif (NOT PROJ_FIND_QUIETLY)
else (PROJ_FOUND)
if (PROJ_FIND_REQUIRED)
message(FATAL_ERROR "Could not find PROJ")
endif (PROJ_FIND_REQUIRED)
endif (PROJ_FOUND)
# show the PROJ_INCLUDE_DIRS and PROJ_LIBRARIES variables only in the advanced view
mark_as_advanced(PROJ_INCLUDE_DIRS PROJ_LIBRARIES)
endif (PROJ_LIBRARIES AND PROJ_INCLUDE_DIRS)
cmake/Modules/FindQextSerialPort.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find QextSerialPort
# Once done this will define
#
# QEXTSERIALPORT_FOUND - system has QEXTSERIALPORT
# QEXTSERIALPORT_INCLUDE_DIRS - the QEXTSERIALPORT include directory
# QEXTSERIALPORT_LIBRARIES - Link these to use QEXTSERIALPORT
# QEXTSERIALPORT_DEFINITIONS - Compiler switches required for using QEXTSERIALPORT
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
# updated for QextSerialPort by Dan Horák
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (QEXTSERIALPORT_LIBRARIES AND QEXTSERIALPORT_INCLUDE_DIRS)
# in cache already
set(QEXTSERIALPORT_FOUND TRUE)
else (QEXTSERIALPORT_LIBRARIES AND QEXTSERIALPORT_INCLUDE_DIRS)
find_path(QEXTSERIALPORT_INCLUDE_DIRS
NAMES
qextserialport.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/QtExtSerialPort
/usr/local/include/QtExtSerialPort
/opt/local/include/QtExtSerialPort
/sw/include/QtExtSerialPort
)
# debian uses version suffixes
# add suffix evey new release
find_library(QEXTSERIALPORT_LIBRARIES
NAMES
qextserialport-1.2
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
if (QEXTSERIALPORT_INCLUDE_DIRS AND QEXTSERIALPORT_LIBRARIES)
set(QEXTSERIALPORT_FOUND TRUE)
endif (QEXTSERIALPORT_INCLUDE_DIRS AND QEXTSERIALPORT_LIBRARIES)
if (QEXTSERIALPORT_FOUND)
if (NOT QEXTSERIALPORT_FIND_QUIETLY)
message(STATUS "Found QtExtSerialPort: ${QEXTSERIALPORT_LIBRARIES}")
endif (NOT QEXTSERIALPORT_FIND_QUIETLY)
else (QEXTSERIALPORT_FOUND)
if (QEXTSERIALPORT_FIND_REQUIRED)
message(FATAL_ERROR "Could not find QtExtSerialPort")
endif (QEXTSERIALPORT_FIND_REQUIRED)
endif (QEXTSERIALPORT_FOUND)
# show the QEXTSERIALPORT_INCLUDE_DIRS and QEXTSERIALPORT_LIBRARIES variables only in the advanced view
mark_as_advanced(QEXTSERIALPORT_INCLUDE_DIRS QEXTSERIALPORT_LIBRARIES)
endif (QEXTSERIALPORT_LIBRARIES AND QEXTSERIALPORT_INCLUDE_DIRS)
if (WIN32)
set(QEXTSERIALPORT_FOUND FALSE)
set(QEXTSERIALPORT_LIBRARIES "")
set(QEXTSERIALPORT_INCLUDE_DIRS "")
endif (WIN32)
cmake/Modules/FindQtSoap.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find QtSoap
# Once done this will define
#
# QTSOAP_FOUND - system has QTSOAP
# QTSOAP_INCLUDE_DIRS - the QTSOAP include directory
# QTSOAP_LIBRARIES - Link these to use QTSOAP
# QTSOAP_DEFINITIONS - Compiler switches required for using QTSOAP
#
# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
# updated for QtSoap by Dan Horák
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
# in cache already
set(QTSOAP_FOUND TRUE)
else (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
find_path(QTSOAP_INCLUDE_DIRS
NAMES
qtsoap.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/QtSoap
/usr/local/include/QtSoap
/opt/local/include/QtSoap
/sw/include/QtSoap
)
# debian uses version suffixes
# add suffix evey new release
find_library(QTSOAP_LIBRARIES
NAMES
qtsoap
PATHS
/usr/lib64
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
if (QTSOAP_INCLUDE_DIRS AND QTSOAP_LIBRARIES)
set(QTSOAP_FOUND TRUE)
endif (QTSOAP_INCLUDE_DIRS AND QTSOAP_LIBRARIES)
if (QTSOAP_FOUND)
if (NOT QTSOAP_FIND_QUIETLY)
message(STATUS "Found QtSoap: ${QTSOAP_LIBRARIES}")
endif (NOT QTSOAP_FIND_QUIETLY)
else (QTSOAP_FOUND)
if (QTSOAP_FIND_REQUIRED)
message(FATAL_ERROR "Could not find QtSoap")
endif (QTSOAP_FIND_REQUIRED)
endif (QTSOAP_FOUND)
# show the QTSOAP_INCLUDE_DIRS and QTSOAP_LIBRARIES variables only in the advanced view
mark_as_advanced(QTSOAP_INCLUDE_DIRS QTSOAP_LIBRARIES)
endif (QTSOAP_LIBRARIES AND QTSOAP_INCLUDE_DIRS)
if (WIN32)
set(QTSOAP_FOUND FALSE)
set(QTSOAP_LIBRARIES "")
set(QTSOAP_INCLUDE_DIRS "")
endif (WIN32)
cmake/Modules/FindQuaZip.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find QUAZIP
# Once done this will define
#
# QUAZIP_FOUND - system has QUAZIP
# QUAZIP_INCLUDE_DIRS - the QUAZIP include directory
# QUAZIP_LIBRARIES - Link these to use QUAZIP
# QUAZIP_DEFINITIONS - Compiler switches required for using QUAZIP
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
# in cache already
set(QUAZIP_FOUND TRUE)
else (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
find_path(QUAZIP_INCLUDE_DIR
NAMES
quazip.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
/usr/include/quazip5
/usr/local/include/quazip5
/opt/local/include/quazip5
/usr/include/quazip
/usr/local/include/quazip
/opt/local/include/quazip
/sw/include/quazip5
${CMAKE_INSTALL_PREFIX}/include
${QUAZIP_DEV_PATH}/include/
)
mark_as_advanced(QUAZIP_INCLUDE_DIR)
IF (WIN32)
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h HINTS ${QT_DEV_PATH}/include/QtZlib/)
ENDIF (WIN32)
find_library(LIBQUAZIP_LIBRARY
NAMES
quazip5
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
${CMAKE_INSTALL_PREFIX}/include
${QUAZIP_DEV_PATH}/lib
)
mark_as_advanced(LIBQUAZIP_LIBRARY)
if (LIBQUAZIP_LIBRARY)
set(LIBQUAZIP_FOUND TRUE)
endif (LIBQUAZIP_LIBRARY)
set(QUAZIP_INCLUDE_DIRS
${QUAZIP_INCLUDE_DIR}
IF (WIN32)
${QUAZIP_ZLIB_INCLUDE_DIR}
ENDIF (WIN32)
)
if (LIBQUAZIP_FOUND)
set(QUAZIP_LIBRARIES ${QUAZIP_LIBRARIES} ${LIBQUAZIP_LIBRARY})
endif (LIBQUAZIP_FOUND)
if (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
set(QUAZIP_FOUND TRUE)
endif (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
if (QUAZIP_FOUND)
if (NOT QUAZIP_FIND_QUIETLY)
message(STATUS "Found QUAZIP: ${QUAZIP_LIBRARIES}")
message(STATUS "Found QUAZIP: ${QUAZIP_INCLUDE_DIR}")
endif (NOT QUAZIP_FIND_QUIETLY)
else (QUAZIP_FOUND)
if (QUAZIP_FIND_REQUIRED)
message(FATAL_ERROR "Could not find QUAZIP")
endif (QUAZIP_FIND_REQUIRED)
endif (QUAZIP_FOUND)
# show the QUAZIP_INCLUDE_DIRS and QUAZIP_LIBRARIES variables only in the advanced view
mark_as_advanced(QUAZIP_INCLUDE_DIRS QUAZIP_LIBRARIES)
endif (QUAZIP_LIBRARIES AND QUAZIP_INCLUDE_DIRS)
cmake/Modules/FindXercesC.cmake deleted 100644 → 0
View file @ b66cdb9e
# - Try to find XercesC
# Once done this will define
#
# XERCESC_FOUND - system has XercesC
# XERCESC_INCLUDE_DIRS - the XercesC include directory
# XERCESC_LIBRARIES - Link these to use XercesC
# XERCESC_DEFINITIONS - Compiler switches required for using XercesC
#
# Copyright (c) 2009 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (XERCESC_LIBRARIES AND XERCESC_INCLUDE_DIRS)
# in cache already
set(XERCESC_FOUND TRUE)
else (XERCESC_LIBRARIES AND XERCESC_INCLUDE_DIRS)
find_path(XERCESC_INCLUDE_DIR
NAMES
xercesc/util/XercesVersion.hpp
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
C:/progra~1/xerces-c_2_8_0/include
)
mark_as_advanced(XERCESC_INCLUDE_DIR)
find_library(XERCES-C_LIBRARY
NAMES
xerces-c
xerces-c_2
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
C:/progra~1/xerces-c_2_8_0/lib
)
mark_as_advanced(XERCES-C_LIBRARY)
find_library(XERCES-DEPDOM_LIBRARY
NAMES
xerces-depdom
xerces-depdom_2
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
C:/progra~1/xerces-c_2_8_0/lib
)
mark_as_advanced(XERCES-DEPDOM_LIBRARY)
if (XERCES-C_LIBRARY)
set(XERCES-C_FOUND TRUE)
endif (XERCES-C_LIBRARY)
if (XERCES-DEPDOM_LIBRARY)
set(XERCES-DEPDOM_FOUND TRUE)
endif (XERCES-DEPDOM_LIBRARY)
set(XERCESC_INCLUDE_DIRS
${XERCESC_INCLUDE_DIR}
)
if (XERCES-C_FOUND)
set(XERCESC_LIBRARIES
${XERCESC_LIBRARIES}
${XERCES-C_LIBRARY}
)
endif (XERCES-C_FOUND)
if (XERCES-DEPDOM_FOUND)
set(XERCESC_LIBRARIES
${XERCESC_LIBRARIES}
${XERCES-DEPDOM_LIBRARY}
)
endif (XERCES-DEPDOM_FOUND)
if (XERCESC_INCLUDE_DIRS AND XERCESC_LIBRARIES)
set(XERCESC_FOUND TRUE)
endif (XERCESC_INCLUDE_DIRS AND XERCESC_LIBRARIES)
if (XERCESC_FOUND)
if (NOT XercesC_FIND_QUIETLY)
message(STATUS "Found XercesC: ${XERCESC_LIBRARIES}")
endif (NOT XercesC_FIND_QUIETLY)
else (XERCESC_FOUND)
if (XercesC_FIND_REQUIRED)
message(FATAL_ERROR "Could not find XercesC")
endif (XercesC_FIND_REQUIRED)
endif (XERCESC_FOUND)
# show the XERCESC_INCLUDE_DIRS and XERCESC_LIBRARIES variables only in the advanced view
mark_as_advanced(XERCESC_INCLUDE_DIRS XERCESC_LIBRARIES)
endif (XERCESC_LIBRARIES AND XERCESC_INCLUDE_DIRS)
debian/changelog
View file @ 240a96f1
qmapshack (1.12.3-2) UNRELEASED; urgency=medium
qmapshack (1.13.0-1~exp1) experimental; urgency=medium
* New upstream release.
* Remove package name from lintian overrides.
* Update copyright file, changes:
- Add Henri Hornburg to copyright holders
- Add license & copyright for geocaching icons
* Add patches for missing Find*.cmake files.
-- Bas Couwenberg <sebastic@debian.org> Fri, 15 Mar 2019 15:39:57 +0100
-- Bas Couwenberg <sebastic@debian.org> Mon, 08 Apr 2019 19:05:25 +0200
qmapshack (1.12.3-1) unstable; urgency=medium
......
debian/copyright
View file @ 240a96f1
......@@ -5,6 +5,7 @@ Source: https://bitbucket.org/maproom/qmapshack/downloads
Files: *
Copyright: 2006-2009, 2012, 2014-2018, Oliver Eichler <oliver.eichler@gmx.de>
2019, Henri Hornburg hrnbg@t-online.de>
2016-2018, Michel Durand <zero@cms123.fr>
2017-2018, Norbert Truchsess <norbert.truchsess@t-online.de>
2015-2017, Christian Eichler <code@christian-eichler.de>
......@@ -15,6 +16,10 @@ Copyright: 2006-2009, 2012, 2014-2018, Oliver Eichler <oliver.eichler@gmx.de>
2009, Joerg Wunsch <j@uriah.heep.sax.de>
License: GPL-3+
Files: src/icons/geocaching/*
Copyright: 2013, GlobalcachingEU
License: Expat
Files: src/qmapshack/GeoMath.cpp
src/qmapshack/GeoMath.h
src/qmapshack/units/CUnitImperial.cpp
......@@ -121,6 +126,26 @@ License: Apache-2.0
On Debian systems, the complete text of the Apache License version 2
an be found in the `/usr/share/common-licenses/Apache-2.0' file.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
.
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
License: WTFPL-2
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
.
......
debian/patches/FindPROJ4.patch 0 → 100644
View file @ 240a96f1
Description: Add FindPROJ4.cmake.
Origin: https://salsa.debian.org/debian/openorienteering-mapper/raw/debian/0.8.4-1/cmake/FindPROJ4.cmake
--- /dev/null
+++ b/cmake/Modules/FindPROJ4.cmake
@@ -0,0 +1,152 @@
+#.rst:
+# FindPROJ4
+# --------
+#
+# Find the proj includes and library.
+#
+# IMPORTED Targets
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines :prop_tgt:`IMPORTED` target ``PROJ4::proj``,
+# if Proj.4 has been found.
+#
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines the following variables:
+#
+# ::
+#
+# PROJ4_INCLUDE_DIRS - where to find proj_api.h, etc.
+# PROJ4_LIBRARIES - List of libraries when using libproj.
+# PROJ4_FOUND - True if libproj found.
+#
+# ::
+#
+# PROJ4_VERSION - The version of libproj found (x.y.z)
+# PROJ4_VERSION_MAJOR - The major version of libproj
+# PROJ4_VERSION_MINOR - The minor version of libproj
+# PROJ4_VERSION_PATCH - The patch version of libproj
+# PROJ4_VERSION_TWEAK - always 0
+# PROJ4_VERSION_COUNT - The number of version components, always 3
+#
+# Hints
+# ^^^^^
+#
+# A user may set ``PROJ4_ROOT`` to a libproj installation root to tell this
+# module where to look exclusively.
+
+#=============================================================================
+# Copyright 2016 Kai Pastor
+#
+#
+# This file was derived from CMake 3.5's module FindZLIB.cmake
+# which has the following terms:
+#
+# Copyright 2001-2011 Kitware, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# * The names of Kitware, Inc., the Insight Consortium, or the names of
+# any consortium members, or of any contributors, may not be used to
+# endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+# Search PROJ4_ROOT exclusively if it is set.
+if(PROJ4_ROOT)
+ set(_PROJ4_SEARCH PATHS ${PROJ4_ROOT} NO_DEFAULT_PATH)
+else()
+ set(_PROJ4_SEARCH)
+endif()
+
+find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h ${_PROJ4_SEARCH} PATH_SUFFIXES include)
+mark_as_advanced(PROJ4_INCLUDE_DIR)
+
+if(PROJ4_INCLUDE_DIR AND EXISTS "${PROJ4_INCLUDE_DIR}/proj_api.h")
+ file(STRINGS "${PROJ4_INCLUDE_DIR}/proj_api.h" PROJ4_H REGEX "^#define PJ_VERSION [0-9]+$")
+
+ string(REGEX REPLACE "^.*PJ_VERSION ([0-9]).*$" "\\1" PROJ4_VERSION_MAJOR "${PROJ4_H}")
+ string(REGEX REPLACE "^.*PJ_VERSION [0-9]([0-9]).*$" "\\1" PROJ4_VERSION_MINOR "${PROJ4_H}")
+ string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ4_VERSION_PATCH "${PROJ4_H}")
+ set(PROJ4_VERSION "${PROJ4_VERSION_MAJOR}.${PROJ4_VERSION_MINOR}.${PROJ4_VERSION_PATCH}")
+ set(PROJ4_VERSION_COUNT 3)
+endif()
+
+# Allow PROJ4_LIBRARY to be set manually, as the location of the proj library
+if(NOT PROJ4_LIBRARY)
+ set(PROJ4_NAMES proj)
+ set(PROJ4_NAMES_DEBUG projd)
+ if(WIN32 AND DEFINED PROJ4_VERSION_MAJOR AND DEFINED PROJ4_VERSION_MINOR)
+ list(APPEND PROJ4_NAMES proj_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR})
+ list(APPEND PROJ4_NAMES projd_${PROJ4_VERSION_MAJOR}_${PROJ4_VERSION_MINOR})
+ endif()
+ find_library(PROJ4_LIBRARY_RELEASE NAMES ${PROJ4_NAMES} ${_PROJ4_SEARCH} PATH_SUFFIXES lib)
+ find_library(PROJ4_LIBRARY_DEBUG NAMES ${PROJ4_NAMES_DEBUG} ${_PROJ4_SEARCH} PATH_SUFFIXES lib)
+ include(SelectLibraryConfigurations)
+ select_library_configurations(PROJ4)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set PROJ4_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PROJ4
+ REQUIRED_VARS
+ PROJ4_LIBRARY
+ PROJ4_INCLUDE_DIR
+ VERSION_VAR
+ PROJ4_VERSION
+)
+
+if(PROJ4_FOUND)
+ set(PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR})
+
+ if(NOT PROJ4_LIBRARIES)
+ set(PROJ4_LIBRARIES ${PROJ4_LIBRARY})
+ endif()
+
+ if(NOT TARGET PROJ4::proj)
+ add_library(PROJ4::proj UNKNOWN IMPORTED)
+ set_target_properties(PROJ4::proj PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${PROJ4_INCLUDE_DIRS}")
+
+ if(PROJ4_LIBRARY_RELEASE)
+ set_property(TARGET PROJ4::proj APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(PROJ4::proj PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${PROJ4_LIBRARY_RELEASE}")
+ endif()
+
+ if(PROJ4_LIBRARY_DEBUG)
+ set_property(TARGET PROJ4::proj APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(PROJ4::proj PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${PROJ4_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT PROJ4_LIBRARY_RELEASE AND NOT PROJ4_LIBRARY_DEBUG)
+ set_property(TARGET PROJ4::proj APPEND PROPERTY
+ IMPORTED_LOCATION "${PROJ4_LIBRARY}")
+ endif()
+ endif()
+endif()
debian/patches/FindQuaZip5.patch 0 → 100644
View file @ 240a96f1
Description: Add FindQuaZip5.cmake.
Origin: https://raw.githubusercontent.com/nomacs/nomacs/3.12/ImageLounge/cmake/FindQuaZip5.cmake
--- /dev/null
+++ b/cmake/Modules/FindQuaZip5.cmake
@@ -0,0 +1,42 @@
+# QUAZIP_FOUND - QuaZip library was found
+# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES - List of QuaZip libraries
+# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
+
+
+IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ # in cache already
+ SET(QUAZIP_FOUND TRUE)
+ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ IF (Qt5Core_FOUND)
+ set(QUAZIP_LIB_VERSION_SUFFIX 5)
+ ENDIF()
+ IF (WIN32)
+ FIND_PATH(QUAZIP_LIBRARY_DIR
+ WIN32_DEBUG_POSTFIX d
+ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
+ HINTS "C:/Programme/" "C:/Program Files"
+ PATH_SUFFIXES QuaZip/lib
+ )
+ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
+ FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip)
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
+ ELSE(WIN32)
+ FIND_PACKAGE(PkgConfig)
+ pkg_check_modules(PC_QUAZIP quazip)
+ FIND_LIBRARY(QUAZIP_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+ HINTS /usr/lib /usr/lib64
+ )
+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ HINTS /usr/include /usr/local/include
+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+ )
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ ENDIF (WIN32)
+ INCLUDE(FindPackageHandleStandardArgs)
+ SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+ find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
debian/patches/series 0 → 100644
View file @ 240a96f1
FindPROJ4.patch
FindQuaZip5.patch
msvc_64/3rdparty.txt
View file @ 240a96f1
......@@ -43,8 +43,8 @@ QMS depends on the 3rd party software listed below:
8.) MariaDB, https://mariadb.com/
For MySql/MariaDB support, the Qt mysql plugin needs libmysql.dll.
This DLL can be downloaded as part of the precompiled MariaDB binaries at https://downloads.mariadb.org/mariadb/+releases/
For the current QMS binary distribution, libmysql.dll is taken from mariadb version 10.1.11:
https://downloads.mariadb.org/mariadb/10.1.11/ --> mariadb-10.1.11-winx64.zip
For the current QMS binary distribution, libmysql.dll is taken from mariadb version 10.1.34:
https://downloads.mariadb.org/mariadb/10.1.34 --> mariadb-10.1.34-winx64.zip
9.) libjpeg
The libjpeg.lib and header files are needed to compile the helper program qmt_map2jnx.exe
......
msvc_64/QMapShack_Installer.nsi
View file @ 240a96f1
......@@ -19,6 +19,10 @@
;Revision Log
; 03-Aug-2014 First version of QMapShack installer based on the existing QLandkarteGT installer
; 01-Aug-2018 Adapt for VS2017
; 09-Feb-2019 Adapt to use of Qt 5.12.1 and fusion style
; Note: the command line parameter "--style fusion" for qmapshack.exe switches to a GUI appearance which is perceived as less antique than the default
; See https://doc.qt.io/qt-5/qstyle.html https://doc.qt.io/qt-5/qstylefactory.html https://forum.qt.io/topic/23978/qfusionstyle https://forum.qt.io/topic/23978/qfusionstyle)
;=================== BEGIN SCRIPT ====================
; Include for nice Setup UI, see http://nsis.sourceforge.net/Docs/Modern%20UI%202/Readme.html
......@@ -257,7 +261,7 @@ Section "StartMenue" StartMenue
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "--style fusion" "$INSTDIR\QMapShack.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "" "$INSTDIR\QMapTool.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "--style fusion" "$INSTDIR\QMapTool.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/Home" "" "$INSTDIR\kfm_home.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk" "http://www.gdal.org/" "" "$INSTDIR\gdalicon.ico"
......