Skip to content

Commit 53f4607

Browse files
committed
Merge bitcoin/bitcoin#29696: tidy: remove todo, set minimum CMake to 3.22
11ee058 tidy: remove C compiler check (fanquake) c3a4ea1 tidy: set CMAKE_CXX_STANDARD to 20 (fanquake) 5b690ae tidy: remove terminfo TODO (fanquake) 24410e5 tidy: set minimum CMake to 3.22 (fanquake) Pull request description: See hebasto/bitcoin#123 for the minimum version bump. ACKs for top commit: hebasto: re-ACK 11ee058. Tree-SHA512: 94a508ea24bf17919961bbdbc2e9d17658858e179c3b2017d5932557af32530d9d6aab197453aa5444f5478c417129c5a8e39522ff82bafac0d5a6966c7246d3
2 parents 5560741 + 11ee058 commit 53f4607

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

contrib/devtools/bitcoin-tidy/CMakeLists.txt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-
cmake_minimum_required(VERSION 3.9)
1+
cmake_minimum_required(VERSION 3.22)
22

3-
project(bitcoin-tidy VERSION 1.0.0 DESCRIPTION "clang-tidy checks for Bitcoin Core")
3+
project(bitcoin-tidy
4+
VERSION
5+
1.0.0
6+
DESCRIPTION "clang-tidy checks for Bitcoin Core"
7+
LANGUAGES CXX)
48

59
include(GNUInstallDirs)
610

7-
set(CMAKE_CXX_STANDARD 17)
11+
set(CMAKE_CXX_STANDARD 20)
812
set(CMAKE_CXX_STANDARD_REQUIRED True)
913
set(CMAKE_CXX_EXTENSIONS False)
1014

11-
# TODO: Figure out how to avoid the terminfo check
15+
set(CMAKE_DISABLE_FIND_PACKAGE_CURL ON)
16+
set(CMAKE_DISABLE_FIND_PACKAGE_FFI ON)
17+
set(CMAKE_DISABLE_FIND_PACKAGE_LibEdit ON)
18+
set(CMAKE_DISABLE_FIND_PACKAGE_LibXml2 ON)
19+
set(CMAKE_DISABLE_FIND_PACKAGE_Terminfo ON)
20+
set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON)
21+
set(CMAKE_DISABLE_FIND_PACKAGE_zstd ON)
22+
1223
find_package(LLVM REQUIRED CONFIG)
1324
find_program(CLANG_TIDY_EXE NAMES "clang-tidy-${LLVM_VERSION_MAJOR}" "clang-tidy" HINTS ${LLVM_TOOLS_BINARY_DIR})
1425
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")

0 commit comments

Comments
 (0)