summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@ugent.be>2017-11-17 19:24:14 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-11-18 11:03:44 +0100
commit3fc5c6532f1a56f27310fb733a089e1064716b10 (patch)
treee331109cd47dac48d803bd405ae41a83b40b9b5f /src
parentdb505a91d035b5942113c2eace2e356894f60fc8 (diff)
downloadouroboros-3fc5c6532f1a56f27310fb733a089e1064716b10.tar.gz
ouroboros-3fc5c6532f1a56f27310fb733a089e1064716b10.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/shim-eth-llc/CMakeLists.txt6
-rw-r--r--src/ipcpd/shim-udp/CMakeLists.txt5
-rw-r--r--src/lib/CMakeLists.txt5
3 files changed, 14 insertions, 2 deletions
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")
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index f0454bd8..db99bc97 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -37,6 +37,7 @@ if (HAVE_ROBUST_MUTEX)
set(HAVE_ROBUST_MUTEX TRUE)
else ()
message(STATUS "Robust mutex support disabled by user")
+ unset(HAVE_ROBUST_MUTEX)
endif ()
endif ()
@@ -51,6 +52,7 @@ if (FUSE_LIBRARIES)
set(HAVE_FUSE TRUE CACHE INTERNAL "")
else ()
message(STATUS "FUSE support disabled by user")
+ unset(HAVE_FUSE CACHE)
endif ()
else ()
message(STATUS "Install FUSE version > 2.6 to enable RIB access")
@@ -79,6 +81,7 @@ if (LIBGCRYPT_LIBRARIES)
set(HAVE_LIBGCRYPT TRUE CACHE INTERNAL "")
else ()
message(STATUS "libgcrypt support disabled by user")
+ unset(HAVE_LIBGCRYPT CACHE)
endif()
else ()
message(STATUS "Install version > \"1.7.0\" to enable libgcrypt support "
@@ -100,6 +103,7 @@ if (OPENSSL_FOUND)
set(HAVE_OPENSSL TRUE)
else()
message(STATUS "OpenSSL support disabled by user")
+ unset(HAVE_OPENSSL)
endif()
endif ()
@@ -117,6 +121,7 @@ else ()
set(HAVE_SYS_RANDOM TRUE)
else ()
set(SYS_RND_HDR "")
+ unset(HAVE_SYS_RANDOM)
endif ()
endif()