Skip to content

Commit 975b589

Browse files
committedFeb 21, 2017
Merge branch 'master' of https://github.com/qgis/QGIS into direction_neutral_segmentation
2 parents 3da4413 + e20ed4b commit 975b589

File tree

182 files changed

+653
-714
lines changed

Some content is hidden

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

182 files changed

+653
-714
lines changed
 

‎CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,20 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
671671
# that may be in the same install prefix
672672
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
673673

674+
####################################################
675+
# clang-tidy
676+
FIND_PROGRAM(
677+
CLANG_TIDY_EXE
678+
NAMES "clang-tidy"
679+
DOC "Path to clang-tidy executable"
680+
)
681+
IF(NOT CLANG_TIDY_EXE)
682+
MESSAGE(STATUS "clang-tidy not found.")
683+
ELSE(NOT CLANG_TIDY_EXE)
684+
MESSAGE(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
685+
SET(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-cppcoreguidelines*,-readability-implicit-bool-cast,-llvm-include-order,-cert-err58-cpp,-modernize-pass-by-value,-google-readability-braces-around-statements,-modernize-use-auto,-modernize-loop-convert,-readability-else-after-return,-readability-braces-around-statements,-google-runtime-references,-readability-named-parameter,-google-default-arguments,-google-readability-todo,-readability-inconsistent-declaration-parameter-name,-cert-flp30-c,-google-readability-casting,-clang-analyzer-security.FloatLoopCounter,-google-runtime-int,-modernize-use-using,-google-explicit-constructor,-google-build-using-namespace,-cert-err34-c,-clang-analyzer-core.CallAndMessage,-google-readability-function-size,-modernize-make-shared,-modernize-use-nullptr,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.NonNullParamChecker,performance-unnecessary-copy-initialization,-readability-simplify-boolean-expr,-modernize-raw-string-literal,-performance-unnecessary-copy-initialization")
686+
ENDIF(NOT CLANG_TIDY_EXE)
687+
674688
#############################################################
675689
# create qgsversion.h
676690
IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)

‎cmake/FindQGIS.cmake

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,30 @@
77
## QGIS_ANALYSIS_LIBRARY = full path to the ANALYSIS library
88
## QGIS_PLUGIN_DIR = full path to where QGIS plugins are installed
99
## QGIS_INCLUDE_DIR = where to find headers
10+
## QGIS_UI_INCLUDE_DIR = where to find ui_* generated headers
11+
##
12+
## Definitions or ENV variables affecting search locations
13+
##
14+
## OSGEO4W_ROOT = [A-Z]:/path/to/OSGeo4W/install/root
15+
## (^ use forward slashes!)
16+
## OSGEO4W_QGIS_SUBDIR = qgis[-rel|-ltr][-dev], in OSGEO4W_ROOT/apps/
17+
## QGIS_MAC_PATH = /path/to/any/QGIS.app/Contents
18+
## QGIS_BUILD_PATH = [A-Z:]/path/to/QGIS/build/directory
1019
##
1120
## Tim Sutton
21+
## Larry Shaffer (2017-01-31)
1222

1323
#MESSAGE("Searching for QGIS")
1424
IF(WIN32)
25+
# OSGEO4W_QGIS_SUBDIR relative install: qgis[-rel|-ltr][-dev], etc.
26+
IF (NOT OSGEO4W_QGIS_SUBDIR OR "${OSGEO4W_QGIS_SUBDIR}" STREQUAL "")
27+
IF (NOT "$ENV{OSGEO4W_QGIS_SUBDIR}" STREQUAL "")
28+
SET (OSGEO4W_QGIS_SUBDIR $ENV{OSGEO4W_QGIS_SUBDIR})
29+
ELSE ()
30+
SET (OSGEO4W_QGIS_SUBDIR qgis)
31+
ENDIF ()
32+
ENDIF ()
33+
1534
#MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/QGIS")
1635
IF (MINGW)
1736
FIND_PATH(QGIS_PLUGIN_DIR
@@ -40,7 +59,7 @@ IF(WIN32)
4059
FIND_PATH(QGIS_PLUGIN_DIR
4160
NAMES spatialqueryplugin.dll
4261
PATHS
43-
"$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
62+
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/plugins"
4463
"$ENV{PROGRAMFILES}/QGIS/plugins"
4564
)
4665
FIND_PATH(QGIS_INCLUDE_DIR
@@ -49,6 +68,7 @@ IF(WIN32)
4968
"$ENV{INCLUDE}"
5069
"$ENV{LIB_DIR}/include/qgis"
5170
"$ENV{OSGEO4W_ROOT}/include"
71+
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/include"
5272
"$ENV{PROGRAMFILES}/QGIS/include"
5373
)
5474
FIND_LIBRARY(QGIS_CORE_LIBRARY
@@ -57,6 +77,7 @@ IF(WIN32)
5777
"$ENV{LIB_DIR}/lib/"
5878
"$ENV{LIB}"
5979
"$ENV{OSGEO4W_ROOT}/lib"
80+
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/lib"
6081
"$ENV{PROGRAMFILES}/QGIS/lib"
6182
)
6283
FIND_LIBRARY(QGIS_GUI_LIBRARY
@@ -65,6 +86,7 @@ IF(WIN32)
6586
"$ENV{LIB_DIR}"
6687
"$ENV{LIB}"
6788
"$ENV{OSGEO4W_ROOT}/lib"
89+
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/lib"
6890
"$ENV{PROGRAMFILES}/QGIS/lib"
6991
)
7092
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
@@ -73,86 +95,111 @@ IF(WIN32)
7395
"$ENV{LIB_DIR}"
7496
"$ENV{LIB}"
7597
"$ENV{OSGEO4W_ROOT}/lib"
98+
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/lib"
7699
"$ENV{PROGRAMFILES}/QGIS/lib"
77100
)
78101
ENDIF (MSVC)
79102
ELSE(WIN32)
80103
IF(UNIX)
81-
# try to use bundle on mac
82-
SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
83104
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
84105
FIND_PATH(QGIS_PLUGIN_DIR
85106
NAMES libspatialqueryplugin.so
86107
PATHS
108+
${QGIS_BUILD_PATH}/PlugIns/qgis
109+
${QGIS_MAC_PATH}/PlugIns/qgis
87110
${QGIS_PREFIX_PATH}/lib/qgis/plugins/
88111
/usr/lib64/qgis/plugins
89112
/usr/lib/qgis
113+
/usr/lib/qgis/plugins
90114
/usr/local/lib/qgis/plugins
91-
${QGIS_MAC_PATH}/PlugIns/qgis
92115
"$ENV{LIB_DIR}/lib/qgis/plugins"
93116
"$ENV{LIB_DIR}/lib/qgis"
94117
)
95118
FIND_PATH(QGIS_INCLUDE_DIR
96119
NAMES qgis.h
97120
PATHS
121+
${QGIS_BUILD_PATH}/output/lib/qgis_core.framework/Headers
122+
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
98123
{QGIS_PREFIX_PATH}/include/qgis
99124
/usr/include/qgis
100125
/usr/local/include/qgis
101126
/Library/Frameworks/qgis_core.framework/Headers
102-
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
127+
"$ENV{LIB_DIR}/include/qgis"
128+
)
129+
FIND_PATH(QGIS_UI_INCLUDE_DIR
130+
NAMES ui_qgscredentialdialog.h
131+
PATHS
132+
${QGIS_BUILD_PATH}/src/ui
133+
${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
134+
{QGIS_PREFIX_PATH}/include/qgis
135+
/usr/include/qgis
136+
/usr/local/include/qgis
137+
/Library/Frameworks/qgis_gui.framework/Headers
103138
"$ENV{LIB_DIR}/include/qgis"
104139
)
105140
# also get other frameworks' headers folders on OS X
106141
IF (APPLE)
107142
FIND_PATH(QGIS_GUI_INCLUDE_DIR
108143
NAMES qgisgui.h
109144
PATHS
110-
/Library/Frameworks/qgis_core.framework/Headers
111-
${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
145+
${QGIS_BUILD_PATH}/output/lib
146+
${QGIS_MAC_PATH}/Frameworks
147+
/Library/Frameworks
148+
PATH_SUFFIXES qgis_gui.framework/Headers
112149
)
113150
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
114151
NAMES qgsinterpolator.h
115152
PATHS
116-
/Library/Frameworks/qgis_analysis.framework/Headers
117-
${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
153+
${QGIS_BUILD_PATH}/output/lib
154+
${QGIS_MAC_PATH}/Frameworks
155+
/Library/Frameworks
156+
PATH_SUFFIXES qgis_analysis.framework/Headers
118157
)
119158
SET(QGIS_INCLUDE_DIR
120159
${QGIS_INCLUDE_DIR}
121160
${QGIS_GUI_INCLUDE_DIR}
122161
${QGIS_ANALYSIS_INCLUDE_DIR}
162+
${QGIS_UI_INCLUDE_DIR}
123163
)
124164
ENDIF (APPLE)
165+
125166
FIND_LIBRARY(QGIS_CORE_LIBRARY
126167
NAMES qgis_core
127168
PATHS
169+
${QGIS_BUILD_PATH}/output/lib
170+
${QGIS_MAC_PATH}/Frameworks
171+
${QGIS_MAC_PATH}/lib
128172
${QGIS_PREFIX_PATH}/lib/
129173
/usr/lib64
130174
/usr/lib
131175
/usr/local/lib
132176
/Library/Frameworks
133-
${QGIS_MAC_PATH}/Frameworks
134177
"$ENV{LIB_DIR}/lib/"
135178
)
136179
FIND_LIBRARY(QGIS_GUI_LIBRARY
137180
NAMES qgis_gui
138181
PATHS
182+
${QGIS_BUILD_PATH}/output/lib
183+
${QGIS_MAC_PATH}/Frameworks
184+
${QGIS_MAC_PATH}/lib
139185
${QGIS_PREFIX_PATH}/lib/
140186
/usr/lib64
141187
/usr/lib
142188
/usr/local/lib
143189
/Library/Frameworks
144-
${QGIS_MAC_PATH}/Frameworks
145190
"$ENV{LIB_DIR}/lib/"
146191
)
147192
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
148193
NAMES qgis_analysis
149194
PATHS
195+
${QGIS_BUILD_PATH}/output/lib
196+
${QGIS_MAC_PATH}/Frameworks
197+
${QGIS_MAC_PATH}/lib
150198
${QGIS_PREFIX_PATH}/lib/
151199
/usr/lib64
152200
/usr/lib
153201
/usr/local/lib
154202
/Library/Frameworks
155-
${QGIS_MAC_PATH}/Frameworks
156203
"$ENV{LIB_DIR}/lib/"
157204
)
158205
ENDIF(UNIX)

0 commit comments

Comments
 (0)
Please sign in to comment.