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

pull ryanofsky wants to merge 1 commits into bitcoin-core:master from ryanofsky:pr/cren changing 8 files +35 −32

ryanofsky commented at 12:36 AM on March 30, 2024: collaborator

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

cmake: rename new packages and module introduced in #95 and #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 |
|----------------+----------------------------------+----------------------------------------------------|

c6a1d7fb6b

ryanofsky merged this on Mar 30, 2024
ryanofsky closed this on Mar 30, 2024

hebasto commented at 6:10 AM on March 30, 2024: member

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.

hebasto referenced this in commit ab18aad93b on Mar 30, 2024
ryanofsky referenced this in commit dc9b4e6a99 on Apr 1, 2024
ryanofsky referenced this in commit e29f74e8ff on Apr 1, 2024
ryanofsky commented at 6:57 PM on April 1, 2024: collaborator

Thanks for catching this. I accidentally replied to the wrong issue earlier in https://github.com/chaincodelabs/libmultiprocess/pull/95#issuecomment-2028113800. I posted an update in #98 which should fix this, but if there's any problem just let me know.
hebasto referenced this in commit aae82b3c7c on Apr 3, 2024
hebasto referenced this in commit bca4d31e87 on Apr 16, 2024
hebasto referenced this in commit 41049a696f on Apr 29, 2024
vasild referenced this in commit 756c71d8c4 on Apr 30, 2024
hebasto referenced this in commit fe95376dc6 on May 4, 2024
hebasto referenced this in commit 3154a6d2ba on May 20, 2024
hebasto referenced this in commit 55d2ddce76 on Jun 4, 2024
ryanofsky referenced this in commit 3e6c61fdc2 on Jun 13, 2024
hebasto referenced this in commit 3046138e40 on Jun 29, 2024
hebasto referenced this in commit 563cd01d79 on Jun 30, 2024
hebasto referenced this in commit d48599bfa9 on Jul 3, 2024
hebasto referenced this in commit a5c13d8843 on Jul 3, 2024
hebasto referenced this in commit 8903cb1b24 on Jul 4, 2024
ryanofsky referenced this in commit eecd63c8e2 on Jul 11, 2024
ryanofsky referenced this in commit e58937ea45 on Jul 12, 2024
hebasto referenced this in commit c9d2e62daf on Jul 13, 2024
hebasto referenced this in commit a9cc122a33 on Jul 13, 2024
hebasto referenced this in commit 3e68afb229 on Jul 15, 2024
hebasto referenced this in commit 64e420d274 on Jul 16, 2024
hebasto referenced this in commit bd784c5fd1 on Jul 16, 2024
hebasto referenced this in commit a68581fea7 on Jul 16, 2024
hebasto referenced this in commit 4883197abc on Jul 16, 2024
ryanofsky referenced this in commit 48a2fc6fb1 on Jul 16, 2024
ryanofsky referenced this in commit 8574f79db9 on Jul 16, 2024
Sjors referenced this in commit c2dbbc5fb7 on Jul 17, 2024
Sjors referenced this in commit fa0a0fa537 on Jul 17, 2024
Sjors referenced this in commit 10100360b6 on Jul 18, 2024
Sjors referenced this in commit 39c615dbdc on Jul 18, 2024
ryanofsky referenced this in commit 33e86e04d1 on Jul 18, 2024
ryanofsky referenced this in commit b3a5eb738f on Jul 18, 2024
Sjors referenced this in commit 3cfcac15ba on Jul 19, 2024
ryanofsky referenced this in commit 261395944e on Jul 24, 2024
ryanofsky referenced this in commit c030548f20 on Jul 26, 2024
ryanofsky referenced this in commit ebe93a5d0a on Sep 26, 2024
bitcoin-core locked this on Jun 25, 2025

Contributors

ryanofsky

hebasto

Linked (view graph)

#95 cmake: Introduce `LibmultiprocessMacros` module #96 cmake: Introduce packages