summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-11-03 10:32:00 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-11-03 10:32:00 +0100
commit7fe38b0200979c15cc27a84ab51b2730e7f2d30e (patch)
tree74291a659a18b72e3ff278b2300cb874ddab59aa /src
parenteabbb5eb368df3ff606a472bd96a4a4077a214d8 (diff)
downloadfastd-7fe38b0200979c15cc27a84ab51b2730e7f2d30e.tar
fastd-7fe38b0200979c15cc27a84ab51b2730e7f2d30e.zip
Fix disabling modules
Diffstat (limited to 'src')
-rw-r--r--src/crypto/cipher/CMakeLists.txt6
-rw-r--r--src/crypto/mac/CMakeLists.txt6
-rw-r--r--src/methods/CMakeLists.txt9
3 files changed, 14 insertions, 7 deletions
diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt
index 6cf6d64..3d70c70 100644
--- a/src/crypto/cipher/CMakeLists.txt
+++ b/src/crypto/cipher/CMakeLists.txt
@@ -16,9 +16,11 @@ macro(fastd_cipher_impl cipher name)
string(REPLACE - _ cipher_ "${cipher}")
string(TOUPPER "${cipher_}" CIPHER)
- set_property(GLOBAL APPEND PROPERTY FASTD_CIPHER_${CIPHER}_IMPLS ${name})
+ fastd_module(cipher enabled "cipher implementation" "${cipher} ${name}" ${ARGN})
- fastd_module(cipher "cipher implementation" "${cipher} ${name}" ${ARGN})
+ if(${enabled})
+ set_property(GLOBAL APPEND PROPERTY FASTD_CIPHER_${CIPHER}_IMPLS ${name})
+ endif(${enabled})
endmacro(fastd_cipher_impl)
macro(fastd_cipher_impl_include_directories cipher name)
diff --git a/src/crypto/mac/CMakeLists.txt b/src/crypto/mac/CMakeLists.txt
index eb3c903..8c80ee1 100644
--- a/src/crypto/mac/CMakeLists.txt
+++ b/src/crypto/mac/CMakeLists.txt
@@ -16,9 +16,11 @@ macro(fastd_mac_impl mac name)
string(REPLACE - _ mac_ "${mac}")
string(TOUPPER "${mac_}" MAC)
- set_property(GLOBAL APPEND PROPERTY FASTD_MAC_${MAC}_IMPLS ${name})
+ fastd_module(mac enabled "MAC implementation" "${mac} ${name}" ${ARGN})
- fastd_module(mac "MAC implementation" "${mac} ${name}" ${ARGN})
+ if(${enabled})
+ set_property(GLOBAL APPEND PROPERTY FASTD_MAC_${MAC}_IMPLS ${name})
+ endif(${enabled})
endmacro(fastd_mac_impl)
macro(fastd_mac_impl_include_directories mac name)
diff --git a/src/methods/CMakeLists.txt b/src/methods/CMakeLists.txt
index 0060f7c..f67ea0c 100644
--- a/src/methods/CMakeLists.txt
+++ b/src/methods/CMakeLists.txt
@@ -1,9 +1,12 @@
add_library(methods STATIC "${CMAKE_CURRENT_BINARY_DIR}/methods.c")
-add_library(method_common STATIC "common.c")
+add_library(method_common STATIC EXCLUDE_FROM_ALL "common.c")
macro(fastd_method name)
- fastd_module(method "method" ${name} ${ARGN})
- set_property(GLOBAL APPEND PROPERTY FASTD_METHODS ${name})
+ fastd_module(method enabled "method" ${name} ${ARGN})
+
+ if(${enabled})
+ set_property(GLOBAL APPEND PROPERTY FASTD_METHODS ${name})
+ endif(${enabled})
endmacro(fastd_method)
macro(fastd_method_include_directories)