diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2026-02-07 13:01:42 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2026-02-13 09:22:29 +0100 |
| commit | ec473cb9a6817bc748c4496a6dba719e7b751368 (patch) | |
| tree | d7df6f1d5bb64542381a84afb0046bedda7e3eb9 /cmake | |
| parent | 70300bdd48ece3763cc812fee276968767e77b3c (diff) | |
| download | ouroboros-ec473cb9a6817bc748c4496a6dba719e7b751368.tar.gz ouroboros-ec473cb9a6817bc748c4496a6dba719e7b751368.zip | |
build: Fix invisible IPCP_TARGET variables
The IPCP_*_TARGET variables (e.g., set(IPCP_LOCAL_TARGET ipcpd-local))
were defined locally in each IPCP's CMakeLists.txt (e.g.,
CMakeLists.txt), but the configure_file() that substitutes
@IPCP_LOCAL_TARGET@ into config.h.in runs in a sibling scope that is
processed before ipcpd. Since CMake variables don't propagate between
sibling directory scopes, all @IPCP_*_TARGET@ substituted to empty
strings, resulting in IPCP_LOCAL_EXEC "".
Moved the IPCP_*_TARGET definitions into the cmake/config/ipcp/*.cmake
files so they are known when generating config.h.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config/ipcp/broadcast.cmake | 2 | ||||
| -rw-r--r-- | cmake/config/ipcp/eth.cmake | 3 | ||||
| -rw-r--r-- | cmake/config/ipcp/local.cmake | 2 | ||||
| -rw-r--r-- | cmake/config/ipcp/udp.cmake | 3 | ||||
| -rw-r--r-- | cmake/config/ipcp/unicast.cmake | 2 |
5 files changed, 12 insertions, 0 deletions
diff --git a/cmake/config/ipcp/broadcast.cmake b/cmake/config/ipcp/broadcast.cmake index 3c4d98da..79f41d10 100644 --- a/cmake/config/ipcp/broadcast.cmake +++ b/cmake/config/ipcp/broadcast.cmake @@ -1,4 +1,6 @@ # Broadcast IPCP configuration options for Ouroboros +set(IPCP_BROADCAST_TARGET ipcpd-broadcast) + set(IPCP_BROADCAST_MPL 100 CACHE STRING "Default maximum packet lifetime for the Broadcast IPCP, in ms") diff --git a/cmake/config/ipcp/eth.cmake b/cmake/config/ipcp/eth.cmake index 2f50d24d..4b9007d2 100644 --- a/cmake/config/ipcp/eth.cmake +++ b/cmake/config/ipcp/eth.cmake @@ -1,6 +1,9 @@ # Ethernet IPCP configuration options for Ouroboros # Options for eth-llc and eth-dix IPCPs +set(IPCP_ETH_LLC_TARGET ipcpd-eth-llc) +set(IPCP_ETH_DIX_TARGET ipcpd-eth-dix) + set(IPCP_ETH_RD_THR 1 CACHE STRING "Number of reader threads in Ethernet IPCP") set(IPCP_ETH_WR_THR 1 CACHE STRING diff --git a/cmake/config/ipcp/local.cmake b/cmake/config/ipcp/local.cmake index df47c45b..88ee8998 100644 --- a/cmake/config/ipcp/local.cmake +++ b/cmake/config/ipcp/local.cmake @@ -1,5 +1,7 @@ # Local IPCP configuration options for Ouroboros +set(IPCP_LOCAL_TARGET ipcpd-local) + set(IPCP_LOCAL_MPL 100 CACHE STRING "Default maximum packet lifetime for the Local IPCP, in ms") diff --git a/cmake/config/ipcp/udp.cmake b/cmake/config/ipcp/udp.cmake index 691948ab..0124c261 100644 --- a/cmake/config/ipcp/udp.cmake +++ b/cmake/config/ipcp/udp.cmake @@ -1,6 +1,9 @@ # UDP IPCP configuration options for Ouroboros # Options for udp4 and udp6 IPCPs +set(IPCP_UDP4_TARGET ipcpd-udp4) +set(IPCP_UDP6_TARGET ipcpd-udp6) + set(IPCP_UDP_RD_THR 3 CACHE STRING "Number of reader threads in UDP IPCPs") set(IPCP_UDP_WR_THR 3 CACHE STRING diff --git a/cmake/config/ipcp/unicast.cmake b/cmake/config/ipcp/unicast.cmake index 905c661a..3b5b0ce7 100644 --- a/cmake/config/ipcp/unicast.cmake +++ b/cmake/config/ipcp/unicast.cmake @@ -1,5 +1,7 @@ # Unicast IPCP configuration options for Ouroboros +set(IPCP_UNICAST_TARGET ipcpd-unicast) + set(IPCP_UNICAST_MPL 100 CACHE STRING "Default maximum packet lifetime for the Unicast IPCP, in ms") set(PFT_SIZE 256 CACHE STRING |