Skip to content

Commit

Permalink
Merge bitcoin#29696: tidy: remove todo, set minimum CMake to 3.22
Browse files Browse the repository at this point in the history
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 #123 for the minimum version bump.

ACKs for top commit:
  hebasto:
    re-ACK 11ee058.

Tree-SHA512: 94a508ea24bf17919961bbdbc2e9d17658858e179c3b2017d5932557af32530d9d6aab197453aa5444f5478c417129c5a8e39522ff82bafac0d5a6966c7246d3
  • Loading branch information
fanquake committed Mar 25, 2024
2 parents 5560741 + 11ee058 commit 53f4607
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions contrib/devtools/bitcoin-tidy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
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")
project(bitcoin-tidy
VERSION
1.0.0
DESCRIPTION "clang-tidy checks for Bitcoin Core"
LANGUAGES CXX)

include(GNUInstallDirs)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
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_FFI 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}")
Expand Down

0 comments on commit 53f4607

Please sign in to comment.