Skip to content

Commit

Permalink
Merge #277: cmake: Port PR30490 and PR30513 from the master branch
Browse files Browse the repository at this point in the history
1995169 fixup! cmake: Add `MULTIPROCESS` option (Hennadii Stepanov)
fbf9a64 fixup! build: Generate `toolchain.cmake` in depends (Hennadii Stepanov)
4ef9fc6 depends: Bump `libmultiprocess` for CMake fixes (Hennadii Stepanov)
ff3916c depends: bump libmultiprocess for CMake fixes (Cory Fields)
07f6cd7 Revert "depends: Bump libmultiprocess source" (Hennadii Stepanov)

Pull request description:

  This PR ports bitcoin#30490 and bitcoin#30513.

  The first commit ensures there are no conflicts when applying commits being ported.

Top commit has no ACKs.

Tree-SHA512: 6dbfc608aedcc3ab991b2983146a459f64b43f57f6612ffdaf1152b83591cb260a885e86dd8aed25c46869d197582a59fa780932c3fad1ffa150fe8aa4fee010
  • Loading branch information
hebasto committed Jul 24, 2024
2 parents d3a10e6 + 1995169 commit ead20f0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,10 @@ cmake_dependent_option(WITH_DBUS "Enable DBus support." ON "CMAKE_SYSTEM_NAME ST

option(WITH_MULTIPROCESS "Build multiprocess bitcoin-node and bitcoin-gui executables in addition to monolithic bitcoind and bitcoin-qt executables. Requires libmultiprocess library. Experimental." OFF)
if(WITH_MULTIPROCESS)
find_package(Libmultiprocess CONFIG REQUIRED)
find_package(LibmultiprocessGen CONFIG REQUIRED)
find_package(Libmultiprocess COMPONENTS Lib)
find_package(LibmultiprocessNative COMPONENTS Bin
NAMES Libmultiprocess
)
endif()

cmake_dependent_option(BUILD_GUI_TESTS "Build test_bitcoin-qt executable." ON "BUILD_GUI;BUILD_TESTS" OFF)
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/native_libmultiprocess.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=native_libmultiprocess
$(package)_version=003eb04d6d0029fd24a330ab63d5a9ba08cf240f
$(package)_version=6aca5f389bacf2942394b8738bbe15d6c9edfb9b
$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
$(package)_file_name=$($(package)_version).tar.gz
$(package)_sha256_hash=d23e82f7a0b498a876a4bcdecca3104032a9f9372e1a0cf0049409a2718e5d39
$(package)_sha256_hash=2efeed53542bc1d8af3291f2b6f0e5d430d86a5e04e415ce33c136f2c226a51d
$(package)_dependencies=native_capnp

define $(package)_config_cmds
Expand Down
2 changes: 1 addition & 1 deletion depends/toolchain.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ endif()

if("@multiprocess@" STREQUAL "1")
set(WITH_MULTIPROCESS ON CACHE BOOL "")
set(LibmultiprocessGen_DIR "${CMAKE_FIND_ROOT_PATH}/native/lib/cmake/LibmultiprocessGen" CACHE PATH "")
set(LibmultiprocessNative_DIR "${CMAKE_FIND_ROOT_PATH}/native/lib/cmake/Libmultiprocess" CACHE PATH "")
else()
set(WITH_MULTIPROCESS OFF CACHE BOOL "")
endif()

0 comments on commit ead20f0

Please sign in to comment.