From 24410e560ac9add5dbae424964bc96554e6fd1a9 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 21 Mar 2024 17:49:01 +0000 Subject: [PATCH 1/4] tidy: set minimum CMake to 3.22 Matches https://github.com/hebasto/bitcoin/pull/123. This also also dev/ci only code. --- contrib/devtools/bitcoin-tidy/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/devtools/bitcoin-tidy/CMakeLists.txt b/contrib/devtools/bitcoin-tidy/CMakeLists.txt index 35e60d1d87e..d10d584b03d 100644 --- a/contrib/devtools/bitcoin-tidy/CMakeLists.txt +++ b/contrib/devtools/bitcoin-tidy/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.22) project(bitcoin-tidy VERSION 1.0.0 DESCRIPTION "clang-tidy checks for Bitcoin Core") From 5b690aeb1583e207b083e83b8d882f7d1c2d2683 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 21 Mar 2024 11:26:59 +0000 Subject: [PATCH 2/4] tidy: remove terminfo TODO At the same time, also disable searching for CURL, LibEdit, LibXml2, ZLIB and zstd none of which we use. --- contrib/devtools/bitcoin-tidy/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/devtools/bitcoin-tidy/CMakeLists.txt b/contrib/devtools/bitcoin-tidy/CMakeLists.txt index d10d584b03d..081c3050fd5 100644 --- a/contrib/devtools/bitcoin-tidy/CMakeLists.txt +++ b/contrib/devtools/bitcoin-tidy/CMakeLists.txt @@ -8,7 +8,13 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_EXTENSIONS False) -# TODO: Figure out how to avoid the terminfo check +set(CMAKE_DISABLE_FIND_PACKAGE_CURL ON) +set(CMAKE_DISABLE_FIND_PACKAGE_LibEdit ON) +set(CMAKE_DISABLE_FIND_PACKAGE_LibXml2 ON) +set(CMAKE_DISABLE_FIND_PACKAGE_Terminfo ON) +set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON) +set(CMAKE_DISABLE_FIND_PACKAGE_zstd ON) + find_package(LLVM REQUIRED CONFIG) find_program(CLANG_TIDY_EXE NAMES "clang-tidy-${LLVM_VERSION_MAJOR}" "clang-tidy" HINTS ${LLVM_TOOLS_BINARY_DIR}) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") From c3a4ea19715de292517b932d0a3b24ace72e9919 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 22 Mar 2024 13:38:23 +0000 Subject: [PATCH 3/4] tidy: set CMAKE_CXX_STANDARD to 20 --- contrib/devtools/bitcoin-tidy/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/devtools/bitcoin-tidy/CMakeLists.txt b/contrib/devtools/bitcoin-tidy/CMakeLists.txt index 081c3050fd5..f0d3f40a751 100644 --- a/contrib/devtools/bitcoin-tidy/CMakeLists.txt +++ b/contrib/devtools/bitcoin-tidy/CMakeLists.txt @@ -4,7 +4,7 @@ project(bitcoin-tidy VERSION 1.0.0 DESCRIPTION "clang-tidy checks for Bitcoin Co include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_EXTENSIONS False) From 11ee058ef5794de5f1b8e89d62bfa69c64693fff Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 22 Mar 2024 13:48:00 +0000 Subject: [PATCH 4/4] tidy: remove C compiler check Also requires disabling FFI. --- contrib/devtools/bitcoin-tidy/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/devtools/bitcoin-tidy/CMakeLists.txt b/contrib/devtools/bitcoin-tidy/CMakeLists.txt index f0d3f40a751..1260c714236 100644 --- a/contrib/devtools/bitcoin-tidy/CMakeLists.txt +++ b/contrib/devtools/bitcoin-tidy/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.22) -project(bitcoin-tidy VERSION 1.0.0 DESCRIPTION "clang-tidy checks for Bitcoin Core") +project(bitcoin-tidy + VERSION + 1.0.0 + DESCRIPTION "clang-tidy checks for Bitcoin Core" + LANGUAGES CXX) include(GNUInstallDirs) @@ -9,6 +13,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_EXTENSIONS False) set(CMAKE_DISABLE_FIND_PACKAGE_CURL ON) +set(CMAKE_DISABLE_FIND_PACKAGE_FFI ON) set(CMAKE_DISABLE_FIND_PACKAGE_LibEdit ON) set(CMAKE_DISABLE_FIND_PACKAGE_LibXml2 ON) set(CMAKE_DISABLE_FIND_PACKAGE_Terminfo ON)