Skip to content

Commit c426347

Browse files
dg0ytdg0yt
committed
Merge branch 'release-0.5.97' into release
2 parents 9967753 + 24813d6 commit c426347

File tree

506 files changed

+56319
-43014
lines changed

Some content is hidden

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

506 files changed

+56319
-43014
lines changed

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.gitignore export-ignore
22
.gitattributes export-ignore
3-
*.omap binary
3+
*.omap binary diff=xmllint
44
*.ocd binary

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.DS_Store
22
CMakeLists.txt.user
33
*.kdev4
4-
*.pro.user
4+
*.pro.user*
5+
CMakeLists.txt.user*
56
*~
67
build*/
78
help/*.qhc

‎3rd-party/clipper/CMakeLists.txt

+10-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2013, 2014 Kai Pastor
2+
# Copyright 2013-2015 Kai Pastor
33
#
44
# This file is part of OpenOrienteering.
55
#
@@ -103,25 +103,17 @@ ExternalProject_Add(
103103
ExternalProject_Get_Property(Clipper SOURCE_DIR)
104104

105105

106-
# Exported configuration
106+
# The actual library build
107107

108-
set(CLIPPER_INCLUDE_DIR ${SOURCE_DIR}/cpp CACHE PATH
109-
"The directory where to find clipper.hpp"
110-
FORCE
111-
)
112-
mark_as_advanced(CLIPPER_INCLUDE_DIR)
108+
if(CMAKE_COMPILER_IS_GNUCXX)
109+
string(REPLACE "-Wpedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
110+
endif()
113111

114-
set(CLIPPER_LIBRARY polyclipping CACHE STRING
115-
"The Clipper C++ library."
116-
FORCE
117-
)
118-
mark_as_advanced(CLIPPER_LIBRARY)
112+
set(CLIPPER_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/clipper.cpp")
113+
set_source_files_properties(${CLIPPER_SOURCES} PROPERTIES GENERATED TRUE)
119114

115+
add_library(polyclipping STATIC ${CLIPPER_SOURCES})
120116

121-
# The actual library build
117+
target_include_directories(polyclipping PUBLIC ${SOURCE_DIR}/cpp)
122118

123-
set(CLIPPER_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/clipper.cpp")
124-
set_source_files_properties(${CLIPPER_SOURCES} PROPERTIES GENERATED TRUE)
125-
include_directories(${CLIPPER_INCLUDE_DIR})
126-
add_library(${CLIPPER_LIBRARY} STATIC ${CLIPPER_SOURCES})
127-
add_dependencies(${CLIPPER_LIBRARY} Clipper)
119+
add_dependencies(polyclipping Clipper)

‎3rd-party/clipper/clipper.pro

+19-4
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,29 @@
1717
# along with OpenOrienteering. If not, see <http://www.gnu.org/licenses/>.
1818

1919
TEMPLATE = aux
20+
CONFIG += c++11
21+
CONFIG -= debug_and_release
22+
23+
CMAKE_TOOLCHAIN_FILE = $$clean_path($$OUT_PWD/../../toolchain.cmake)
24+
if (exists($$CMAKE_TOOLCHAIN_FILE)) {
25+
CMAKE_ARGS += "-DCMAKE_TOOLCHAIN_FILE=\"$$CMAKE_TOOLCHAIN_FILE\""
26+
clipper.depends += $$CMAKE_TOOLCHAIN_FILE
27+
}
2028

2129
clipper.dir = $$OUT_PWD/clipper
2230
clipper.target = $$clipper.dir/libpolyclipping.a
31+
win32:!gcc: clipper.target = $$clipper.dir/libpolyclipping.lib
2332
clipper.commands = \
2433
mkdir -p "$$clipper.dir" && \
25-
cd $$OUT_PWD/clipper && \
26-
cmake "$$PWD" -DCMAKE_TOOLCHAIN_FILE="$$OUT_PWD/../../toolchain.cmake" && \
27-
PATH="$$NDK_TOOLCHAIN_PATH/bin:${PATH}" $(MAKE) CXXFLAGS=\"$$QMAKE_CXXFLAGS\" LDFLAGS=\"$$QMAKE_LFLAGS\"
34+
cd "$$clipper.dir" && \
35+
if [ -d CMakeFiles -o -f CMakeCache.txt ] ; then rm -R CMake*; fi && \
36+
if [ -d Clipper-prefix ] ; then rm -R Clipper-prefix; fi && \
37+
cmake "$$PWD" $$CMAKE_ARGS && \
38+
PATH="$$NDK_TOOLCHAIN_PATH/bin:${PATH}" $(MAKE) VERBOSE=$(VERBOSE)
2839

2940
QMAKE_EXTRA_TARGETS += clipper
3041
PRE_TARGETDEPS += $$clipper.target
31-
QMAKE_CLEAN += $$clipper.dir/libpolyclipping.* $$clipper.dir/Clipper-prefix/src/Clipper-stamp/*
42+
QMAKE_CLEAN += $$clipper.target
3243

3344
CLIPPER_PRI = \
3445
"$$LITERAL_HASH Generated by $$_PRO_FILE_" \
@@ -37,3 +48,7 @@ CLIPPER_PRI = \
3748
"LIBS += \"-L$$clipper.dir\""
3849

3950
write_file($$OUT_PWD/clipper.pri, CLIPPER_PRI)
51+
52+
OTHER_FILES += \
53+
CMakeLists.txt \
54+
License.txt

‎3rd-party/doxygen/CMakeLists.txt

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
#
2+
# Copyright 2014 Kai Pastor
3+
#
4+
# This file is part of OpenOrienteering.
5+
#
6+
# OpenOrienteering is free software: you can redistribute it and/or modify
7+
# it under the terms of the GNU General Public License as published by
8+
# the Free Software Foundation, either version 3 of the License, or
9+
# (at your option) any later version.
10+
#
11+
# OpenOrienteering is distributed in the hope that it will be useful,
12+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
# GNU General Public License for more details.
15+
#
16+
# You should have received a copy of the GNU General Public License
17+
# along with OpenOrienteering. If not, see <http://www.gnu.org/licenses/>.
18+
19+
20+
project(Doxygen NONE)
21+
22+
cmake_minimum_required(VERSION 2.8.3)
23+
24+
# Configuration options
25+
26+
set(DOXYGEN_VERSION_DEFAULT 1.8.8)
27+
set(DOXYGEN_VERSION ${DOXYGEN_VERSION_DEFAULT} CACHE STRING
28+
"Version number of the doxygen library")
29+
mark_as_advanced(DOXYGEN_VERSION)
30+
31+
message(STATUS "Configuring doxygen ${DOXYGEN_VERSION}")
32+
33+
if (NOT ${DOXYGEN_VERSION} STREQUAL ${DOXYGEN_VERSION_DEFAULT})
34+
message(WARNING
35+
"The doxygen library version is different from the current recommended version "
36+
"(${DOXYGEN_VERSION} vs. ${DOXYGEN_VERSION_DEFAULT}).")
37+
endif()
38+
39+
set(DOXYGEN_MD5SUMS
40+
# Schema: VERSION:MD5
41+
1.8.8:453892def7b378df387585a9358c23d4
42+
)
43+
foreach(line ${DOXYGEN_MD5SUMS})
44+
if(${line} MATCHES "^${DOXYGEN_VERSION}:")
45+
string(REPLACE "${DOXYGEN_VERSION}:" "" DOXYGEN_MD5 ${line})
46+
break()
47+
endif()
48+
endforeach()
49+
if(NOT DOXYGEN_MD5)
50+
message(FATAL_ERROR
51+
"Unknown MD5 sum for doxygen library ${DOXYGEN_VERSION}. "
52+
"Edit ${PROJECT_SOURCE_DIR}/CMakeLists.txt, "
53+
"or specify the correct DOXYGEN_MD5 value at the command line.")
54+
endif()
55+
set(DOXYGEN_SOURCE
56+
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/download
57+
URL "http://sourceforge.net/projects/doxygen/files/rel-${DOXYGEN_VERSION}/doxygen-${DOXYGEN_VERSION}.src.tar.gz/download"
58+
URL_MD5 ${DOXYGEN_MD5}
59+
)
60+
61+
set(DOXYGEN_LICENSE_FILE "${PROJECT_SOURCE_DIR}/LICENSE")
62+
if(EXISTS "${DOXYGEN_LICENSE_FILE}.${DOXYGEN_VERSION}")
63+
set(DOXYGEN_LICENSE_FILE "${DOXYGEN_LICENSE_FILE}.${DOXYGEN_VERSION}")
64+
endif()
65+
file(GLOB DOXYGEN_LICENSE_FILES LICENSE*)
66+
add_custom_target(doxygen-licenses
67+
COMMENT "This target makes Qt Creator show all sources in the project tree."
68+
SOURCES ${DOXYGEN_LICENSE_FILES}
69+
)
70+
71+
# External project definition
72+
73+
include(ExternalProject)
74+
ExternalProject_Add(
75+
doxygen-project
76+
${DOXYGEN_SOURCE}
77+
# Check that the license hasn't changed.
78+
PATCH_COMMAND sed -e "/This version of Mac OS X is unsupported/d" -i.orig qtools/qglobal.h
79+
UPDATE_COMMAND ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE "${DOXYGEN_LICENSE_FILE}"
80+
CONFIGURE_COMMAND "<SOURCE_DIR>/configure" "--release" "--prefix" "<INSTALL_DIR>"
81+
BUILD_IN_SOURCE 1
82+
)
83+
ExternalProject_Get_Property(doxygen-project INSTALL_DIR)
84+
85+
86+
# Exported configuration
87+
88+
add_executable(doxygen IMPORTED GLOBAL)
89+
set_target_properties(doxygen PROPERTIES
90+
IMPORTED_LOCATION "${INSTALL_DIR}/bin/doxygen"
91+
)
92+
add_dependencies(doxygen doxygen-project)
93+
set(DOXYGEN_EXECUTABLE doxygen CACHE PATH
94+
"The path where to find doxygen"
95+
FORCE
96+
)
97+
mark_as_advanced(DOXYGEN_EXECUTABLE)

0 commit comments

Comments
 (0)