Skip to content

Commit 334bedf

Browse files
dg0ytdg0yt
committed
Merge branch 'master' into release
2 parents 5d93135 + 738c919 commit 334bedf

File tree

583 files changed

+321428
-193559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

583 files changed

+321428
-193559
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
CMakeLists.txt.user
3+
.idea
34
*.kdev4
45
*.pro.user*
56
CMakeLists.txt.user*

‎3rd-party/clipper/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ cmake_minimum_required(VERSION 2.8.3)
2323

2424
# Configuration options
2525

26-
set(CLIPPER_VERSION_DEFAULT 6.1.3a)
26+
set(CLIPPER_VERSION_DEFAULT 6.4.2)
2727
if(CLIPPER_VERSION MATCHES "^5")
2828
unset(CLIPPER_VERSION CACHE) # source incompatible
2929
endif()
3030
set(CLIPPER_VERSION ${CLIPPER_VERSION_DEFAULT} CACHE STRING
31-
"Version number of the Clipper library, recommended value: 6.1.3a")
31+
"Version number of the Clipper library")
3232
mark_as_advanced(CLIPPER_VERSION)
3333

3434

@@ -57,6 +57,7 @@ else()
5757
set(CLIPPER_MD5SUMS
5858
# Schema: VERSION:MD5
5959
6.1.3a:4dcd043ce48de59714f07bd3ec7ac62b
60+
6.4.2:100b4ec56c5308bac2d10f3966e35e11
6061
)
6162
foreach(line ${CLIPPER_MD5SUMS})
6263
if(${line} MATCHES "^${CLIPPER_VERSION}:")
@@ -107,6 +108,9 @@ ExternalProject_Get_Property(Clipper SOURCE_DIR)
107108

108109
# The actual library build
109110

111+
set(CMAKE_CXX_CLANG_TIDY "")
112+
set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "")
113+
110114
if(CMAKE_COMPILER_IS_GNUCXX)
111115
string(REPLACE "-Wpedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
112116
endif()

‎3rd-party/clipper/License.txt

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
The Clipper Library (including Delphi, C++ & C# source code, other accompanying
2-
code, examples and documentation), hereafter called "the Software", has been
3-
released under the following license, terms and conditions:
4-
51
Boost Software License - Version 1.0 - August 17th, 2003
62
http://www.boost.org/LICENSE_1_0.txt
73

8-
Permission is hereby granted, free of charge, to any person or organization
9-
obtaining a copy of the Software covered by this license to use, reproduce,
10-
display, distribute, execute, and transmit the Software, and to prepare
11-
derivative works of the Software, and to permit third-parties to whom the
12-
Software is furnished to do so, all subject to the following:
4+
Permission is hereby granted, free of charge, to any person or organization
5+
obtaining a copy of the software and accompanying documentation covered by
6+
this license (the "Software") to use, reproduce, display, distribute,
7+
execute, and transmit the Software, and to prepare derivative works of the
8+
Software, and to permit third-parties to whom the Software is furnished to
9+
do so, all subject to the following:
1310

14-
The copyright notices in the Software and this entire statement, including the
15-
above license grant, this restriction and the following disclaimer, must be
16-
included in all copies of the Software, in whole or in part, and all derivative
17-
works of the Software, unless such copies or derivative works are solely in the
18-
form of machine-executable object code generated by a source language processor.
11+
The copyright notices in the Software and this entire statement, including
12+
the above license grant, this restriction and the following disclaimer,
13+
must be included in all copies of the Software, in whole or in part, and
14+
all derivative works of the Software, unless such copies or derivative
15+
works are solely in the form of machine-executable object code generated by
16+
a source language processor.
1917

20-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
23-
THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY
24-
DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING
25-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
26-
THE SOFTWARE.
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
21+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
22+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
23+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
24+
DEALINGS IN THE SOFTWARE.

‎3rd-party/clipper/License.txt.6.1.3a

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
The Clipper Library (including Delphi, C++ & C# source code, other accompanying
2+
code, examples and documentation), hereafter called "the Software", has been
3+
released under the following license, terms and conditions:
4+
5+
Boost Software License - Version 1.0 - August 17th, 2003
6+
http://www.boost.org/LICENSE_1_0.txt
7+
8+
Permission is hereby granted, free of charge, to any person or organization
9+
obtaining a copy of the Software covered by this license to use, reproduce,
10+
display, distribute, execute, and transmit the Software, and to prepare
11+
derivative works of the Software, and to permit third-parties to whom the
12+
Software is furnished to do so, all subject to the following:
13+
14+
The copyright notices in the Software and this entire statement, including the
15+
above license grant, this restriction and the following disclaimer, must be
16+
included in all copies of the Software, in whole or in part, and all derivative
17+
works of the Software, unless such copies or derivative works are solely in the
18+
form of machine-executable object code generated by a source language processor.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
23+
THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY
24+
DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING
25+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
26+
THE SOFTWARE.

‎3rd-party/qtsingleapplication/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919
find_package(Qt5Widgets REQUIRED)
2020
find_package(Qt5Network REQUIRED)
21+
2122
set(CMAKE_AUTOMOC ON)
23+
set(CMAKE_CXX_CLANG_TIDY "")
24+
set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "")
2225

2326
set(QSINGLEAPP_SRCS
2427
src/qtlocalpeer.cpp

‎3rd-party/qtsingleapplication/src/qtlocalpeer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool QtLocalPeer::isClient()
128128
#endif
129129
if (!res)
130130
qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
131-
QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
131+
QObject::connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
132132
return false;
133133
}
134134

‎3rd-party/qtsingleapplication/src/qtlockedfile.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile
7171

7272
QtLockedFile();
7373
QtLockedFile(const QString &name);
74-
~QtLockedFile();
74+
~QtLockedFile() override;
7575

76-
bool open(OpenMode mode);
76+
bool open(OpenMode mode) override;
7777

7878
bool lock(LockMode mode, bool block = true);
7979
bool unlock();

‎3rd-party/qtsingleapplication/src/qtsingleapplication.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void QtSingleApplication::sysInit(const QString &appId)
137137
{
138138
actWin = 0;
139139
peer = new QtLocalPeer(this, appId);
140-
connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&)));
140+
connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::messageReceived);
141141
}
142142

143143

@@ -288,9 +288,9 @@ void QtSingleApplication::setActivationWindow(QWidget* aw, bool activateOnMessag
288288
{
289289
actWin = aw;
290290
if (activateOnMessage)
291-
connect(peer, SIGNAL(messageReceived(const QString&)), this, SLOT(activateWindow()));
291+
connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::activateWindow);
292292
else
293-
disconnect(peer, SIGNAL(messageReceived(const QString&)), this, SLOT(activateWindow()));
293+
disconnect(peer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::activateWindow);
294294
}
295295

296296

‎3rd-party/qtsingleapplication/src/qtsinglecoreapplication.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv)
7474
: QCoreApplication(argc, argv)
7575
{
7676
peer = new QtLocalPeer(this);
77-
connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&)));
77+
connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleCoreApplication::messageReceived);
7878
}
7979

8080

@@ -87,7 +87,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, int &argc
8787
: QCoreApplication(argc, argv)
8888
{
8989
peer = new QtLocalPeer(this, appId);
90-
connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&)));
90+
connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleCoreApplication::messageReceived);
9191
}
9292

9393

‎CMakeLists.txt

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,17 @@ include(FeatureSummary)
2525

2626
# Project declaration
2727

28-
project(Mapper VERSION 0.7.0 LANGUAGES CXX C)
28+
project(Mapper VERSION 0.8.0 LANGUAGES CXX C)
2929

30-
set(Mapper_COPYRIGHT "(C) 2012-2017 The OpenOrienteering developers")
30+
if(Mapper_VERSION_DISPLAY)
31+
message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")
32+
elseif(CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "Release|MinSizeRel|RelWithDebInfo")
33+
set(Mapper_VERSION_DISPLAY "${CMAKE_BUILD_TYPE} ${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
34+
else()
35+
set(Mapper_VERSION_DISPLAY "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
36+
endif()
37+
38+
set(Mapper_COPYRIGHT "(C) 2012-2018 The OpenOrienteering developers")
3139

3240
set(android_manifest "${PROJECT_SOURCE_DIR}/android/AndroidManifest.xml")
3341
file(READ "${android_manifest}" current)
@@ -56,8 +64,6 @@ if(APPLE)
5664
"Minimum Mac OS X version to build for, recommended: 10.7")
5765
endif()
5866

59-
option(Mapper_TRANSLATIONS_EMBEDDED "Embed all translations in the program executable")
60-
6167
option(Mapper_DEBUG_TRANSLATIONS "Debug missing translations" OFF)
6268

6369
# Used for some Linux distributions which do not provide the polyclipping lib.
@@ -187,8 +193,21 @@ if(NOT TARGET PROJ4::proj)
187193
find_package(PROJ4 MODULE REQUIRED)
188194
endif()
189195

190-
find_package(GDAL REQUIRED)
196+
if(Mapper_USE_GDAL)
197+
find_package(GDAL REQUIRED)
198+
endif()
199+
191200

201+
include("TestBigEndian")
202+
test_big_endian(big_endian)
203+
if(big_endian)
204+
add_definitions(-DMAPPER_BIG_ENDIAN)
205+
endif()
206+
207+
208+
if(ANDROID OR big_endian)
209+
add_definitions(-DNO_NATIVE_FILE_FORMAT)
210+
endif()
192211

193212
if(UNIX AND NOT APPLE)
194213
# set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib/${Mapper_PACKAGE_NAME}/lib")
@@ -206,12 +225,6 @@ else()
206225
add_definitions(-DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DNDEBUG)
207226
endif()
208227

209-
if(NOT Mapper_VERSION_PATCH LESS 99)
210-
set(Mapper_VERSION_DISPLAY "unstable ${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
211-
else()
212-
set(Mapper_VERSION_DISPLAY "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
213-
endif()
214-
215228
# Subdirectories
216229

217230
add_subdirectory("doc/manual")

0 commit comments

Comments
 (0)