From 7fe38b0200979c15cc27a84ab51b2730e7f2d30e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 3 Nov 2013 10:32:00 +0100 Subject: Fix disabling modules --- src/crypto/cipher/CMakeLists.txt | 6 ++++-- src/crypto/mac/CMakeLists.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/crypto') 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) -- cgit v1.2.3