diff --git a/CMakeLists.txt b/CMakeLists.txt index 83616cbbdbb1d..037f9d31d6731 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/depends/packages/native_libmultiprocess.mk b/depends/packages/native_libmultiprocess.mk index 5091005617166..2e30be434cd13 100644 --- a/depends/packages/native_libmultiprocess.mk +++ b/depends/packages/native_libmultiprocess.mk @@ -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 diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 34b6c3e959f3a..b8320caede5d0 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -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()