cmake: rename new packages and module introduced in #95 and #96 #97

ryanofsky · 2024-03-30T00:36:16Z

Rename "LibmultiprocessMacros.cmake" module introduced in #95 to "TargetCapnpSources.cmake" to match the name of the target_capnp_sources function it contains. Also install it to:

  <prefix>/lib/cmake/Libmultiprocess/TargetCapnpSources.cmake

instead of:

  <prefix>/lib/cmake/LibmultiprocessGen/LibmultiprocessMacros.cmake

Rename the "Libmultiprocess" and "LibmultiprocessGen" packages introduced in #96 to "LibmultiprocessLib" and "LibmultiprocessBin", so package names are consistent with component names "lib" and "bin", and one package name is not a prefix of the other. Also rename intermediate files to match component names.

	New	Current
Component name	lib	lib
Package name	LibmultiprocessLib	Libmultiprocess
Config file	LibmultiprocessLibConfig.cmake	Libmultiprocess/LibmultiprocessConfig.cmake
Targets file	Libmultiprocess/LibTargets.cmake	Libmultiprocess/LibmultiprocessTargets.cmake

	New	Current
Component name	bin	bin
Package name	LibmultiprocessBin	LibmultiprocessGen
Config file	LibmultiprocessBinConfig.cmake	LibmultiprocessGen/LibmultiprocessGenConfig.cmake
Targets file	Libmultiprocess/BinTargets.cmake	LibmultiprocessGen/LibmultiprocessGenTargets.cmake

bitcoin-core#96 Rename "LibmultiprocessMacros.cmake" module to "TargetCapnpSources.cmake" to match the name of the target_capnp_sources function it contains. Also install it <prefix>/lib/cmake/Libmultiprocess/TargetCapnpSources.cmake instead of: <prefix>/lib/cmake/LibmultiprocessGen/LibmultiprocessMacros.cmake Rename the "LibmultiprocessGen" package to "LibmultiprocessBin" and rename the "Libmultiprocess" package to "LibmultiprocessLib", so package names are consistent with component names "bin" and "lib", and one package name is not a prefix of the other. Also rename intermediate files to match component names. |----------------+----------------------------------+----------------------------------------------| | | New | Current | |----------------+----------------------------------+----------------------------------------------| | Component name | lib | lib | | Package name | LibmultiprocessLib | Libmultiprocess | | Config file | LibmultiprocessLibConfig.cmake | Libmultiprocess/LibmultiprocessConfig.cmake | | Targets file | Libmultiprocess/LibTargets.cmake | Libmultiprocess/LibmultiprocessTargets.cmake | |----------------+----------------------------------+----------------------------------------------| |----------------+----------------------------------+----------------------------------------------------| | | New | Current | |----------------+----------------------------------+----------------------------------------------------| | Component name | bin | bin | | Package name | LibmultiprocessBin | LibmultiprocessGen | | Config file | LibmultiprocessBinConfig.cmake | LibmultiprocessGen/LibmultiprocessGenConfig.cmake | | Targets file | Libmultiprocess/BinTargets.cmake | LibmultiprocessGen/LibmultiprocessGenTargets.cmake | |----------------+----------------------------------+----------------------------------------------------|

hebasto · 2024-03-30T06:10:45Z

After the following commands:

$ cmake -B build -DCMAKE_INSTALL_PREFIX=/home/hebasto/INSTALL
$ cmake --build build
$ cmake --install build

I have the following installation lib subdirectory structure:

$ tree /home/hebasto/INSTALL
/home/hebasto/INSTALL
├── bin
│   └── mpgen
├── include
│   ├── mp
│   │   ├── proxy.capnp
│   │   ├── proxy.capnp.h
│   │   ├── proxy.h
│   │   ├── proxy-io.h
│   │   ├── proxy-types.h
│   │   └── util.h
│   └── mpgen.mk
└── lib
    ├── cmake
    │   ├── Libmultiprocess
    │   │   ├── BinTargets.cmake
    │   │   ├── BinTargets-noconfig.cmake
    │   │   ├── LibTargets.cmake
    │   │   ├── LibTargets-noconfig.cmake
    │   │   └── TargetCapnpSources.cmake
    │   ├── LibmultiprocessBinConfig.cmake
    │   └── LibmultiprocessLibConfig.cmake
    ├── libmultiprocess.a
    └── pkgconfig
        └── libmultiprocess.pc

7 directories, 17 files

A downstream project being provided with set(CMAKE_FIND_ROOT_PATH /home/hebasto/INSTALL) will fail to find LibmultiprocessBin and LibmultiprocessLib packages with the usual find_package() command due to its search procedure described in the docs.

In short, paths like <prefix>/lib/cmake/<PackageName>Config.cmake are not considered at all.

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

This change combines previous installed "cmake/LibmultiprocessLibConfig.cmake" and "cmake/LibmultiprocessBinConfig.cmake" files into a single "cmake/Libmultiprocess/LibmultiprocessConfig.cmake" file, so it can be imported with "find_package(Libmultiprocess)". The previous locations which were set in bitcoin-core#97 were not actually compatible with find_package search behavior by default. The change also adds some documentation about using the new package to doc/install.md.

dc9b4e6 cmake: Combine installed packages (Ryan Ofsky) 2ed1e9a cmake: CMakeLists.txt cleanup (Ryan Ofsky) Pull request description: This change combines previous installed: - `cmake/LibmultiprocessLibConfig.cmake` - `cmake/LibmultiprocessBinConfig.cmake` files into a single: - `cmake/Libmultiprocess/LibmultiprocessConfig.cmake` file, so it can be imported with `find_package(Libmultiprocess)`. The previous locations which were set in #97 were not compatible with `find_package` search behavior by default. The change also adds some documentation about using the new package to doc/install.md. Top commit has no ACKs. Tree-SHA512: 506a2f73f19de541d36cc192f3553ae583e78644f60e958234b2a29d0c5f053890bbe176f7dbd38bad0598a5fa2426a34e64b0f266bc87a01eaa21cb7ecd1226

ryanofsky · 2024-04-01T18:57:23Z

Thanks for catching this. I accidentally replied to the wrong issue earlier in #95 (comment). I posted an update in #98 which should fix this, but if there's any problem just let me know.

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

depends: Update libmultiprocess library Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in #95 and #96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in #95 and #96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

Fix "connection: run async cleanups in LIFO not FIFO order" bitcoin-core/libmultiprocess#101 is needed to prevent CI failure https://cirrus-ci.com/task/4549686449668096 caused by wallet processes deadlocking during shutdown when node process is killed. This also includes other recent changes: bitcoin-core/libmultiprocess#95: cmake: Introduce `LibmultiprocessMacros` module bitcoin-core/libmultiprocess#96: cmake: Introduce packages bitcoin-core/libmultiprocess#97: cmake: rename new packages and module introduced in bitcoin#95 and bitcoin#96 bitcoin-core/libmultiprocess#98: cmake: Combine installed packages bitcoin-core/libmultiprocess#99: proxy-types: Fix missing space in server destroy log print bitcoin-core/libmultiprocess#100: doc: Add various code comments and documentation bitcoin-core/libmultiprocess#102: doc: Document shutdown sequences better

ryanofsky merged commit 3f8483b into bitcoin-core:master Mar 30, 2024

hebasto added a commit to hebasto/bitcoin that referenced this pull request Mar 30, 2024

depends: Bump libmultiprocess source

ab18aad

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto mentioned this pull request Mar 30, 2024

cmake: Add MULTIPROCESS option hebasto/bitcoin#118

Merged

ryanofsky mentioned this pull request Apr 1, 2024

cmake: Combine installed packages #98

Merged

ryanofsky mentioned this pull request Apr 1, 2024

cmake: Introduce LibmultiprocessMacros module #95

Merged

hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 3, 2024

depends: Bump libmultiprocess source

aae82b3

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 16, 2024

depends: Bump libmultiprocess source

bca4d31

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Apr 29, 2024

depends: Bump libmultiprocess source

41049a6

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

vasild pushed a commit to vasild/bitcoin that referenced this pull request Apr 30, 2024

depends: Bump libmultiprocess source

756c71d

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request May 4, 2024

depends: Bump libmultiprocess source

fe95376

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request May 20, 2024

depends: Bump libmultiprocess source

3154a6d

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jun 4, 2024

depends: Bump libmultiprocess source

55d2ddc

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jun 29, 2024

depends: Bump libmultiprocess source

3046138

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jun 30, 2024

depends: Bump libmultiprocess source

563cd01

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 3, 2024

depends: Bump libmultiprocess source

d48599b

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 3, 2024

depends: Bump libmultiprocess source

a5c13d8

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 4, 2024

depends: Bump libmultiprocess source

8903cb1

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 13, 2024

depends: Bump libmultiprocess source

c9d2e62

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 13, 2024

depends: Bump libmultiprocess source

a9cc122

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 15, 2024

depends: Bump libmultiprocess source

3e68afb

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 16, 2024

depends: Bump libmultiprocess source

64e420d

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 16, 2024

depends: Bump libmultiprocess source

bd784c5

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 16, 2024

depends: Bump libmultiprocess source

a68581f

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

hebasto added a commit to hebasto/bitcoin that referenced this pull request Jul 16, 2024

depends: Bump libmultiprocess source

4883197

Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to bitcoin-core/libmultiprocess#97 (comment)

bitcoin-core locked and limited conversation to collaborators Jun 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

cmake: rename new packages and module introduced in #95 and #96 #97

cmake: rename new packages and module introduced in #95 and #96 #97

Uh oh!

ryanofsky commented Mar 30, 2024 •

edited

Loading

Uh oh!

hebasto commented Mar 30, 2024

Uh oh!

ryanofsky commented Apr 1, 2024

Uh oh!

Uh oh!

cmake: rename new packages and module introduced in #95 and #96 #97

cmake: rename new packages and module introduced in #95 and #96 #97

Uh oh!

Conversation

ryanofsky commented Mar 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto commented Mar 30, 2024

Uh oh!

ryanofsky commented Apr 1, 2024

Uh oh!

Uh oh!

ryanofsky commented Mar 30, 2024 •

edited

Loading