From 3fc5c6532f1a56f27310fb733a089e1064716b10 Mon Sep 17 00:00:00 2001
From: Dimitri Staessens <dimitri.staessens@ugent.be>
Date: Fri, 17 Nov 2017 19:24:14 +0100
Subject: build: Fix setting configuration definitions
Variable in cache need to be explicitly unset else they will remain in
the cache and still be defined by #cmakedefine.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
---
src/ipcpd/shim-eth-llc/CMakeLists.txt | 6 ++++++
src/ipcpd/shim-udp/CMakeLists.txt | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
(limited to 'src/ipcpd')
diff --git a/src/ipcpd/shim-eth-llc/CMakeLists.txt b/src/ipcpd/shim-eth-llc/CMakeLists.txt
index e9c34bbd..c3e954f7 100644
--- a/src/ipcpd/shim-eth-llc/CMakeLists.txt
+++ b/src/ipcpd/shim-eth-llc/CMakeLists.txt
@@ -28,6 +28,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(HAVE_LLC TRUE)
else ()
message(STATUS "Raw socket support for shim-eth-llc disabled by user")
+ unset(HAVE_RAW_SOCKETS)
+ unset(HAVE_LLC)
endif ()
endif ()
@@ -50,6 +52,8 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
else ()
message(STATUS "Berkeley Packet Filter support "
"for shim-eth-llc disabled by user")
+ unset(HAVE_BPF)
+ unset(HAVE_LLC)
endif ()
endif ()
endif ()
@@ -64,6 +68,8 @@ if (NETMAP_C_INCLUDE_DIR)
set(HAVE_LLC TRUE)
else ()
message(STATUS "Netmap support for shim-eth-llc disabled by user")
+ unset(HAVE_NETMAP)
+ unset(HAVE_LLC)
endif ()
endif ()
diff --git a/src/ipcpd/shim-udp/CMakeLists.txt b/src/ipcpd/shim-udp/CMakeLists.txt
index 2bc68154..0319e63d 100644
--- a/src/ipcpd/shim-udp/CMakeLists.txt
+++ b/src/ipcpd/shim-udp/CMakeLists.txt
@@ -43,9 +43,10 @@ if (NSLOOKUP_EXECUTABLE AND NSUPDATE_EXECUTABLE)
if (NOT DISABLE_DNS)
message(STATUS "DDNS support enabled")
set(HAVE_DDNS TRUE CACHE INTERNAL "")
- else ()
+ else ()
message(STATUS "DDNS support disabled by user")
- endif ()
+ unset(HAVE_DDNS CACHE)
+ endif ()
else ()
if (NSLOOKUP_EXECUTABLE)
message(STATUS "Install nsupdate to enable DDNS support")
--
cgit v1.2.3