Skip to content

Commit ac6c598

Browse files
committedNov 1, 2017
Merge branch 'master' of github.com:qgis/QGIS
2 parents 77de9fc + e9d2fd6 commit ac6c598

File tree

274 files changed

+3201
-4243
lines changed

Some content is hidden

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

274 files changed

+3201
-4243
lines changed
 

‎.ci/travis/macos/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ cmake \
5858
-DENABLE_MODELTEST=ON \
5959
-DENABLE_PGTEST=OFF \
6060
-DWITH_QWTPOLAR=OFF \
61-
-DWITH_PYSPATIALITE=ON \
6261
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
6362
..
6463

‎CMakeLists.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -735,18 +735,22 @@ ENDIF (WITH_CORE)
735735

736736
####################################################
737737
# clang-tidy
738+
SET (WITH_CLANG_TIDY FALSE CACHE BOOL "Use Clang tidy")
739+
MARK_AS_ADVANCED(WITH_CORE)
738740
IF (WITH_CORE)
739-
FIND_PROGRAM(
740-
CLANG_TIDY_EXE
741-
NAMES "clang-tidy"
742-
DOC "Path to clang-tidy executable"
743-
)
744-
IF(NOT CLANG_TIDY_EXE)
745-
MESSAGE(STATUS "clang-tidy not found.")
746-
ELSE(NOT CLANG_TIDY_EXE)
747-
MESSAGE(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
748-
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")
749-
ENDIF(NOT CLANG_TIDY_EXE)
741+
IF(WITH_CLANG_TIDY)
742+
FIND_PROGRAM(
743+
CLANG_TIDY_EXE
744+
NAMES "clang-tidy"
745+
DOC "Path to clang-tidy executable"
746+
)
747+
IF(NOT CLANG_TIDY_EXE)
748+
MESSAGE(STATUS "clang-tidy not found.")
749+
ELSE(NOT CLANG_TIDY_EXE)
750+
MESSAGE(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
751+
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")
752+
ENDIF(NOT CLANG_TIDY_EXE)
753+
ENDIF(WITH_CLANG_TIDY)
750754
ENDIF (WITH_CORE)
751755

752756
#############################################################

1 commit comments

Comments
 (1)

borysiasty commented on Nov 1, 2017

@borysiasty
MemberAuthor

oops, sorry for that noise in history

Please sign in to comment.