[FIXUP] cmake: Adjust Libmultiprocess package-related code

hebasto · Jul 23, 2024 · 1d1776b · 1d1776b
1 parent 55783a9
commit 1d1776b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,8 +154,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/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()