Skip to content

Commit 86b3d0d

Browse files
committed
Removed the gcc static analysis for now
1 parent 31b6964 commit 86b3d0d

File tree

3 files changed

+4
-22
lines changed

3 files changed

+4
-22
lines changed

CMakeLists.txt

+3-7
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ cpr_option(CPR_ENABLE_SSL "Enables or disables the SSL backend. Required to perf
3939
cpr_option(CPR_FORCE_OPENSSL_BACKEND "Force to use the OpenSSL backend. If CPR_FORCE_OPENSSL_BACKEND, CPR_FORCE_DARWINSSL_BACKEND, and CPR_FORCE_WINSSL_BACKEND are set to to OFF, cpr will try to automatically detect the best available SSL backend (WinSSL - Windows, OpenSSL - Linux, DarwinSSL - Mac ...)." OFF)
4040
cpr_option(CPR_FORCE_WINSSL_BACKEND "Force to use the WinSSL backend. If CPR_FORCE_OPENSSL_BACKEND, CPR_FORCE_DARWINSSL_BACKEND, and CPR_FORCE_WINSSL_BACKEND are set to to OFF, cpr will try to automatically detect the best available SSL backend (WinSSL - Windows, OpenSSL - Linux, DarwinSSL - Mac ...)." OFF)
4141
cpr_option(CPR_FORCE_DARWINSSL_BACKEND "Force to use the DarwinSSL backend. If CPR_FORCE_OPENSSL_BACKEND, CPR_FORCE_DARWINSSL_BACKEND, and CPR_FORCE_WINSSL_BACKEND are set to to OFF, cpr will try to automatically detect the best available SSL backend (WinSSL - Windows, OpenSSL - Linux, DarwinSSL - Mac ...)." OFF)
42-
cpr_option(CPR_ENABLE_LINTING "Set to ON to enable clang linting. If enabled, CPR_STATIC_ANALYZE has to be disabled." OFF)
43-
cpr_option(CPR_STATIC_ANALYZE "Set to ON to enable the GCC 10 static analysis. If enabled, CPR_ENABLE_LINTING has to be disabled." OFF)
44-
cpr_option(CPR_BUILD_TESTS "Set to ON to build cpr tests." ON)
42+
cpr_option(CPR_ENABLE_LINTING "Set to ON to enable clang linting." ON)
43+
cpr_option(CPR_BUILD_TESTS "Set to ON to build cpr tests." OFF)
4544
cpr_option(CPR_BUILD_TESTS_SSL "Set to ON to build cpr ssl tests" ${CPR_BUILD_TESTS})
4645
message(STATUS "=======================================================")
4746

@@ -51,10 +50,7 @@ include(cmake/code_coverage.cmake)
5150
include(cmake/sanitizer.cmake)
5251
include(cmake/clear_variable.cmake)
5352

54-
# Linting and Static Analyze
55-
if(CPR_ENABLE_LINTING AND CPR_STATIC_ANALYZE)
56-
message(FATAL_ERROR "Linting and the GCC static analysis can not be enabled at the same time! Disable either CPR_STATIC_ANALYZE or CPR_ENABLE_LINTING.")
57-
endif()
53+
# Linting
5854
if(CPR_ENABLE_LINTING)
5955
include(cmake/clang-tidy.cmake)
6056
endif()

cmake/clang-tidy.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
2-
find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy-7 clang-tidy)
2+
find_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy)
33
mark_as_advanced(CLANG_TIDY_EXECUTABLE)
44

55
if (${CLANG_TIDY_EXECUTABLE})

cmake/gcc_analyze.cmake

-14
This file was deleted.

0 commit comments

Comments
 (0)