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 /src | |
| 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 'src')
| -rw-r--r-- | src/ipcpd/broadcast/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ipcpd/eth/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/ipcpd/local/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ipcpd/udp/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/ipcpd/unicast/CMakeLists.txt | 2 |
5 files changed, 0 insertions, 12 deletions
diff --git a/src/ipcpd/broadcast/CMakeLists.txt b/src/ipcpd/broadcast/CMakeLists.txt index 433d9979..6749f660 100644 --- a/src/ipcpd/broadcast/CMakeLists.txt +++ b/src/ipcpd/broadcast/CMakeLists.txt @@ -1,7 +1,5 @@ # Broadcast IPCP build configuration -set(IPCP_BROADCAST_TARGET ipcpd-broadcast) - set(BROADCAST_SOURCES connmgr.c dt.c diff --git a/src/ipcpd/eth/CMakeLists.txt b/src/ipcpd/eth/CMakeLists.txt index e6cc8224..5a36352d 100644 --- a/src/ipcpd/eth/CMakeLists.txt +++ b/src/ipcpd/eth/CMakeLists.txt @@ -1,9 +1,6 @@ # Ethernet IPCPs build configuration (LLC and DIX) # HAVE_ETH detection is in cmake/dependencies.cmake -set(IPCP_ETH_LLC_TARGET ipcpd-eth-llc) -set(IPCP_ETH_DIX_TARGET ipcpd-eth-dix) - add_executable(${IPCP_ETH_LLC_TARGET} llc.c ${IPCP_SOURCES}) add_executable(${IPCP_ETH_DIX_TARGET} dix.c ${IPCP_SOURCES}) diff --git a/src/ipcpd/local/CMakeLists.txt b/src/ipcpd/local/CMakeLists.txt index 0da4d47a..91f300a3 100644 --- a/src/ipcpd/local/CMakeLists.txt +++ b/src/ipcpd/local/CMakeLists.txt @@ -1,7 +1,5 @@ # Local IPCP build configuration -set(IPCP_LOCAL_TARGET ipcpd-local) - add_executable(${IPCP_LOCAL_TARGET} main.c ${IPCP_SOURCES} diff --git a/src/ipcpd/udp/CMakeLists.txt b/src/ipcpd/udp/CMakeLists.txt index 159e9bf5..a98f0919 100644 --- a/src/ipcpd/udp/CMakeLists.txt +++ b/src/ipcpd/udp/CMakeLists.txt @@ -1,9 +1,6 @@ # UDP IPCPs build configuration (UDP4 and UDP6) # DDNS detection is in cmake/dependencies/udp/ddns.cmake -set(IPCP_UDP4_TARGET ipcpd-udp4) -set(IPCP_UDP6_TARGET ipcpd-udp6) - add_executable(${IPCP_UDP4_TARGET} udp4.c ${IPCP_SOURCES}) add_executable(${IPCP_UDP6_TARGET} udp6.c ${IPCP_SOURCES}) diff --git a/src/ipcpd/unicast/CMakeLists.txt b/src/ipcpd/unicast/CMakeLists.txt index 1e095f8b..d3388112 100644 --- a/src/ipcpd/unicast/CMakeLists.txt +++ b/src/ipcpd/unicast/CMakeLists.txt @@ -1,7 +1,5 @@ # Unicast IPCP build configuration -set(IPCP_UNICAST_TARGET ipcpd-unicast) - protobuf_generate_c(DHT_PROTO_SRCS DHT_PROTO_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/dir/dht.proto") |