Skip to content

Commit 7a3dc42

Browse files
signedavsignedav
authored
Merge branch 'master' into uxduplication
2 parents 9ad399d + 5f66494 commit 7a3dc42

File tree

381 files changed

+3979
-2197
lines changed

Some content is hidden

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

381 files changed

+3979
-2197
lines changed

‎cmake/FindExpat.cmake

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
# Find Expat
2-
# ~~~~~~~~~~
3-
# Copyright (c) 2007, Martin Dobias <wonder.sk at gmail.com>
4-
# Redistribution and use is allowed according to the terms of the BSD license.
5-
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
6-
#
7-
# CMake module to search for Expat library
8-
# (library for parsing XML files)
9-
#
10-
# If it's found it sets EXPAT_FOUND to TRUE
11-
# and following variables are set:
12-
# EXPAT_INCLUDE_DIR
13-
# EXPAT_LIBRARY
14-
15-
# FIND_PATH and FIND_LIBRARY normally search standard locations
16-
# before the specified paths. To search non-standard paths first,
17-
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
18-
# and then again with no specified paths to search the default
19-
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
20-
# searching for the same item do nothing.
21-
FIND_PATH(EXPAT_INCLUDE_DIR expat.h
22-
"$ENV{LIB_DIR}/include/"
23-
"$ENV{LIB_DIR}/include/expat"
24-
c:/msys/local/include
25-
NO_DEFAULT_PATH
26-
)
27-
FIND_PATH(EXPAT_INCLUDE_DIR expat.h)
28-
#libexpat needed for msvc version
29-
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat PATHS
30-
"$ENV{LIB_DIR}/lib"
31-
c:/msys/local/lib
32-
NO_DEFAULT_PATH
33-
)
34-
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat)
35-
36-
IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
37-
SET(EXPAT_FOUND TRUE)
38-
ENDIF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
39-
40-
41-
IF (EXPAT_FOUND)
42-
43-
IF (NOT EXPAT_FIND_QUIETLY)
44-
MESSAGE(STATUS "Found Expat: ${EXPAT_LIBRARY}")
45-
ENDIF (NOT EXPAT_FIND_QUIETLY)
46-
47-
ELSE (EXPAT_FOUND)
48-
49-
IF (EXPAT_FIND_REQUIRED)
50-
MESSAGE(FATAL_ERROR "Could not find Expat")
51-
ELSE (EXPAT_FIND_REQUIRED)
52-
IF (NOT EXPAT_FIND_QUIETLY)
53-
MESSAGE(STATUS "Could not find Expat")
54-
ENDIF (NOT EXPAT_FIND_QUIETLY)
55-
ENDIF (EXPAT_FIND_REQUIRED)
56-
57-
ENDIF (EXPAT_FOUND)
1+
# Find Expat
2+
# ~~~~~~~~~~
3+
# Copyright (c) 2007, Martin Dobias <wonder.sk at gmail.com>
4+
# Redistribution and use is allowed according to the terms of the BSD license.
5+
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
6+
#
7+
# CMake module to search for Expat library
8+
# (library for parsing XML files)
9+
#
10+
# If it's found it sets EXPAT_FOUND to TRUE
11+
# and following variables are set:
12+
# EXPAT_INCLUDE_DIR
13+
# EXPAT_LIBRARY
14+
15+
# FIND_PATH and FIND_LIBRARY normally search standard locations
16+
# before the specified paths. To search non-standard paths first,
17+
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
18+
# and then again with no specified paths to search the default
19+
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
20+
# searching for the same item do nothing.
21+
FIND_PATH(EXPAT_INCLUDE_DIR expat.h
22+
"$ENV{LIB_DIR}/include/"
23+
"$ENV{LIB_DIR}/include/expat"
24+
c:/msys/local/include
25+
NO_DEFAULT_PATH
26+
)
27+
FIND_PATH(EXPAT_INCLUDE_DIR expat.h)
28+
#libexpat needed for msvc version
29+
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat PATHS
30+
"$ENV{LIB_DIR}/lib"
31+
c:/msys/local/lib
32+
NO_DEFAULT_PATH
33+
)
34+
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat)
35+
36+
IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
37+
SET(EXPAT_FOUND TRUE)
38+
ENDIF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)
39+
40+
41+
IF (EXPAT_FOUND)
42+
43+
IF (NOT EXPAT_FIND_QUIETLY)
44+
MESSAGE(STATUS "Found Expat: ${EXPAT_LIBRARY}")
45+
ENDIF (NOT EXPAT_FIND_QUIETLY)
46+
47+
ELSE (EXPAT_FOUND)
48+
49+
IF (EXPAT_FIND_REQUIRED)
50+
MESSAGE(FATAL_ERROR "Could not find Expat")
51+
ELSE (EXPAT_FIND_REQUIRED)
52+
IF (NOT EXPAT_FIND_QUIETLY)
53+
MESSAGE(STATUS "Could not find Expat")
54+
ENDIF (NOT EXPAT_FIND_QUIETLY)
55+
ENDIF (EXPAT_FIND_REQUIRED)
56+
57+
ENDIF (EXPAT_FOUND)

‎cmake/FindGRASS.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ ENDIF (WIN32)
160160
IF (UNIX)
161161
IF (GRASS_FIND_VERSION EQUAL 7)
162162
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
163-
FOREACH (VERSION_MINOR 0 1 2 3 4)
164-
FOREACH (VERSION_BUILD 0 1 2 3 4 5)
163+
FOREACH (VERSION_MINOR 0 1 2 3 4 5 6)
164+
FOREACH (VERSION_BUILD 0 1 2 3 4 5 6)
165165
LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
166166
ENDFOREACH (VERSION_BUILD)
167167
ENDFOREACH(VERSION_MINOR)
168168
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
169169
FOREACH (PATH /usr/lib64 /usr/lib)
170-
FOREACH (VERSION grass70, grass71, grass72)
170+
FOREACH (VERSION grass70, grass72, grass74)
171171
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
172172
ENDFOREACH (VERSION)
173173
ENDFOREACH (PATH)
@@ -181,6 +181,7 @@ IF (APPLE)
181181
/Applications/GRASS-7.0.app/Contents/MacOS
182182
/Applications/GRASS-7.1.app/Contents/MacOS
183183
/Applications/GRASS-7.2.app/Contents/MacOS
184+
/Applications/GRASS-7.4.app/Contents/MacOS
184185
)
185186
ENDIF ()
186187
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)

‎cmake/FindProj.cmake

Lines changed: 69 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,69 @@
1-
# Find Proj
2-
# ~~~~~~~~~
3-
# Copyright (c) 2007, Martin Dobias <wonder.sk at gmail.com>
4-
# Redistribution and use is allowed according to the terms of the BSD license.
5-
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
6-
#
7-
# CMake module to search for Proj library
8-
#
9-
# If it's found it sets PROJ_FOUND to TRUE
10-
# and following variables are set:
11-
# PROJ_INCLUDE_DIR
12-
# PROJ_LIBRARY
13-
14-
# FIND_PATH and FIND_LIBRARY normally search standard locations
15-
# before the specified paths. To search non-standard paths first,
16-
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
17-
# and then again with no specified paths to search the default
18-
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
19-
# searching for the same item do nothing.
20-
21-
# try to use framework on mac
22-
# want clean framework path, not unix compatibility path
23-
IF (APPLE)
24-
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
25-
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
26-
OR NOT CMAKE_FIND_FRAMEWORK)
27-
SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
28-
SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
29-
#FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
30-
FIND_LIBRARY(PROJ_LIBRARY PROJ)
31-
IF (PROJ_LIBRARY)
32-
# FIND_PATH doesn't add "Headers" for a framework
33-
SET (PROJ_INCLUDE_DIR ${PROJ_LIBRARY}/Headers CACHE PATH "Path to a file.")
34-
ENDIF (PROJ_LIBRARY)
35-
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
36-
ENDIF ()
37-
ENDIF (APPLE)
38-
39-
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
40-
"$ENV{INCLUDE}"
41-
"$ENV{LIB_DIR}/include"
42-
)
43-
44-
FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
45-
"$ENV{LIB}"
46-
"$ENV{LIB_DIR}/lib"
47-
)
48-
49-
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
50-
SET(PROJ_FOUND TRUE)
51-
ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
52-
53-
54-
IF (PROJ_FOUND)
55-
56-
IF (NOT PROJ_FIND_QUIETLY)
57-
MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY}")
58-
ENDIF (NOT PROJ_FIND_QUIETLY)
59-
60-
ELSE (PROJ_FOUND)
61-
62-
IF (PROJ_FIND_REQUIRED)
63-
MESSAGE(FATAL_ERROR "Could not find Proj")
64-
ENDIF (PROJ_FIND_REQUIRED)
65-
66-
ENDIF (PROJ_FOUND)
1+
# Find Proj
2+
# ~~~~~~~~~
3+
# Copyright (c) 2007, Martin Dobias <wonder.sk at gmail.com>
4+
# Redistribution and use is allowed according to the terms of the BSD license.
5+
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
6+
#
7+
# CMake module to search for Proj library
8+
#
9+
# If it's found it sets PROJ_FOUND to TRUE
10+
# and following variables are set:
11+
# PROJ_INCLUDE_DIR
12+
# PROJ_LIBRARY
13+
14+
# FIND_PATH and FIND_LIBRARY normally search standard locations
15+
# before the specified paths. To search non-standard paths first,
16+
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
17+
# and then again with no specified paths to search the default
18+
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
19+
# searching for the same item do nothing.
20+
21+
# try to use framework on mac
22+
# want clean framework path, not unix compatibility path
23+
IF (APPLE)
24+
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
25+
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
26+
OR NOT CMAKE_FIND_FRAMEWORK)
27+
SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
28+
SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
29+
#FIND_PATH(PROJ_INCLUDE_DIR PROJ/proj_api.h)
30+
FIND_LIBRARY(PROJ_LIBRARY PROJ)
31+
IF (PROJ_LIBRARY)
32+
# FIND_PATH doesn't add "Headers" for a framework
33+
SET (PROJ_INCLUDE_DIR ${PROJ_LIBRARY}/Headers CACHE PATH "Path to a file.")
34+
ENDIF (PROJ_LIBRARY)
35+
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
36+
ENDIF ()
37+
ENDIF (APPLE)
38+
39+
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
40+
"$ENV{INCLUDE}"
41+
"$ENV{LIB_DIR}/include"
42+
)
43+
44+
FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
45+
"$ENV{LIB}"
46+
"$ENV{LIB_DIR}/lib"
47+
)
48+
49+
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
50+
SET(PROJ_FOUND TRUE)
51+
ENDIF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
52+
53+
54+
IF (PROJ_FOUND)
55+
# This macro checks if the symbol exists
56+
include(CheckLibraryExists)
57+
check_library_exists("${PROJ_LIBRARY}" proj_info "" PROJ_HAS_INFO)
58+
59+
IF (NOT PROJ_FIND_QUIETLY)
60+
MESSAGE(STATUS "Found Proj: ${PROJ_LIBRARY}")
61+
ENDIF (NOT PROJ_FIND_QUIETLY)
62+
63+
ELSE (PROJ_FOUND)
64+
65+
IF (PROJ_FIND_REQUIRED)
66+
MESSAGE(FATAL_ERROR "Could not find Proj")
67+
ENDIF (PROJ_FIND_REQUIRED)
68+
69+
ENDIF (PROJ_FOUND)

‎doc/index.dox

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
\section index_intro Introduction
88
\htmlonly<img src="qgis-icon-60x60.png" alt="QGIS"
9-
align="left"><a href="http://qgis.org">QGIS</a>\endhtmlonly\latexonly
9+
align="left"><a href="https://qgis.org">QGIS</a>\endhtmlonly\latexonly
1010
QGIS \endlatexonly is a user friendly Open Source Geographic
1111
Information System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS
1212
supports vector, raster, and database formats. QGIS is licensed under the GNU
@@ -19,33 +19,36 @@ fixes, bug reports, contributed documentation, advocacy and supporting other
1919
users on our mailing lists and forums. Financial contributions are also
2020
welcome.
2121

22-
You can also <a href="http://qgis.org/downloads/qgis-api-doc.zip">download</a>
22+
You can also <a href="https://qgis.org/downloads/qgis-api-doc.zip">download</a>
2323
this documentation or a <a href="qgis.qch">Qt help file</a>
2424
for offline use.
2525

26+
A Python version of the documentation is available
27+
<a href="https://python.qgis.org/api">here</a>.
28+
2629
\section index_APIStability Earlier versions of the API
2730

2831
See \ref api_break for information about incompatible changes to API between releases.
2932

3033
Earlier versions of the documentation are also available on the QGIS
3134
website:
32-
<a href="http://qgis.org/api/2.18">2.18</a>,
33-
<a href="http://qgis.org/api/2.14">2.14 (LTR)</a>,
34-
<a href="http://qgis.org/api/2.12">2.12</a>,
35-
<a href="http://qgis.org/api/2.10">2.10</a>,
36-
<a href="http://qgis.org/api/2.8">2.8 (LTR)</a>,
37-
<a href="http://qgis.org/api/2.6">2.6</a>,
38-
<a href="http://qgis.org/api/2.4">2.4</a>,
39-
<a href="http://qgis.org/api/2.2">2.2</a>,
40-
<a href="http://qgis.org/api/2.0">2.0</a>,
41-
<a href="http://qgis.org/api/1.8">1.8</a>,
42-
<a href="http://qgis.org/api/1.7">1.7</a> and
43-
<a href="http://qgis.org/api/1.6">1.6</a>
35+
<a href="https://qgis.org/api/2.18">2.18 (LTR)</a>,
36+
<a href="https://qgis.org/api/2.14">2.14 (LTR)</a>,
37+
<a href="https://qgis.org/api/2.12">2.12</a>,
38+
<a href="https://qgis.org/api/2.10">2.10</a>,
39+
<a href="https://qgis.org/api/2.8">2.8 (LTR)</a>,
40+
<a href="https://qgis.org/api/2.6">2.6</a>,
41+
<a href="https://qgis.org/api/2.4">2.4</a>,
42+
<a href="https://qgis.org/api/2.2">2.2</a>,
43+
<a href="https://qgis.org/api/2.0">2.0</a>,
44+
<a href="https://qgis.org/api/1.8">1.8</a>,
45+
<a href="https://qgis.org/api/1.7">1.7</a> and
46+
<a href="https://qgis.org/api/1.6">1.6</a>
4447

4548
\section index_maillist Mailing Lists
4649

4750
For support we encourage you to join our <a
48-
href="http://qgis.org/en/site/forusers/support.html#mailing-lists">mailing lists</a> for
51+
href="https://qgis.org/en/site/forusers/support.html#mailing-lists">mailing lists</a> for
4952
users and developers.
5053

5154
\section index_bugs Bug Reporting

0 commit comments

Comments
 (0)