Merge bitcoin/bitcoin#30803: build: Minor build system fixes and amendments
1cc93fe7b4build: Delete dead code that implements `IF_CHECK_FAILED` option (Hennadii Stepanov)341ad23809build: Delete MSVC special case for `BUILD_FOR_FUZZING` option (Hennadii Stepanov)fdad128b52build: Stop enabling CMake's CMP0141 policy (Hennadii Stepanov)b2a6f545b4doc: Drop `ctest` command from Windows cross-compiling instructions (Hennadii Stepanov)73b618582dbuild: Print `CMAKE_CXX_COMPILER_ARG1` in summary (Hennadii Stepanov)f03c942095build, test: Add missed log options (Hennadii Stepanov)6f2cb0eafddoc: Amend comment about ZeroMQ config files (Hennadii Stepanov) Pull request description: This PR addresses the following comments: - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1742342524 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1728692369 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1736110362 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1742931121 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1747723657 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1742328675 - https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1723106474 ACKs for top commit: sipsorcery: tACK1cc93fe7b4(win11 msvc). maflcko: re-ACK1cc93fe7b4Tree-SHA512: a390797bb4d3b7eb9163653b6c9c324e7a01090f6cdda74df7349a24a5c4a2084e5912878747f56561315afc70cae9adb1c363f47ceb0af96004ea591d25171b
This commit is contained in:
6 files changed
+9
-33
No files matched your search
+4
-8
@@ -8,12 +8,6 @@
|
||||
# Centos Stream 9, https://www.centos.org/cl-vs-cs/#end-of-life, EOL in May 2027:
|
||||
# - CMake 3.26.5, https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/
|
||||
cmake_minimum_required(VERSION 3.22)
|
||||
if(POLICY CMP0141)
|
||||
# MSVC debug information format flags are selected by an abstraction.
|
||||
# We want to use the CMAKE_MSVC_DEBUG_INFORMATION_FORMAT variable
|
||||
# to select the MSVC debug information format.
|
||||
cmake_policy(SET CMP0141 NEW)
|
||||
endif()
|
||||
|
||||
if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
message(FATAL_ERROR "In-source builds are not allowed.")
|
||||
@@ -143,7 +137,9 @@ if(WITH_ZMQ)
|
||||
find_package(ZeroMQ CONFIG REQUIRED)
|
||||
else()
|
||||
# The ZeroMQ project has provided config files since v4.2.2.
|
||||
# TODO: Switch to find_package(ZeroMQ) at some point in the future.
|
||||
# However, mainstream distributions do not yet provide CMake
|
||||
# config files for ZeroMQ packages. If they do in the future,
|
||||
# find_package(ZeroMQ) may be used instead.
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(libzmq REQUIRED IMPORTED_TARGET libzmq>=4)
|
||||
endif()
|
||||
@@ -194,7 +190,7 @@ endif()
|
||||
|
||||
option(BUILD_BENCH "Build bench_bitcoin executable." OFF)
|
||||
option(BUILD_FUZZ_BINARY "Build fuzz binary." OFF)
|
||||
cmake_dependent_option(BUILD_FOR_FUZZING "Build for fuzzing. Enabling this will disable all other targets and override BUILD_FUZZ_BINARY." OFF "NOT MSVC" OFF)
|
||||
option(BUILD_FOR_FUZZING "Build for fuzzing. Enabling this will disable all other targets and override BUILD_FUZZ_BINARY." OFF)
|
||||
|
||||
option(INSTALL_MAN "Install man pages." ON)
|
||||
|
||||
|
||||
Reference in new issue
Block a user