From eabbb5eb368df3ff606a472bd96a4a4077a214d8 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 3 Nov 2013 03:34:00 +0100 Subject: Improve build system for ciphers and MACs as well --- cmake/fastd_module.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cmake/fastd_module.cmake') diff --git a/cmake/fastd_module.cmake b/cmake/fastd_module.cmake index 1c2da9d..53b6d0f 100644 --- a/cmake/fastd_module.cmake +++ b/cmake/fastd_module.cmake @@ -1,10 +1,11 @@ -function(fastd_module type name) +function(fastd_module type info name) string(TOUPPER "${type}" TYPE) string(REPLACE - _ name_ "${name}") + string(REPLACE " " _ name_ "${name_}") string(TOUPPER "${name_}" NAME) - set(WITH_${TYPE}_${NAME} TRUE CACHE BOOL "Include the ${name} ${type}") + set(WITH_${TYPE}_${NAME} TRUE CACHE BOOL "Include the ${name} ${info}") if(WITH_${TYPE}_${NAME}) add_library(${type}_${name_} STATIC ${ARGN}) @@ -13,8 +14,6 @@ function(fastd_module type name) set_property(TARGET ${type}s APPEND PROPERTY LINK_LIBRARIES ${type}_${name_}) list(APPEND ${TYPE}S ${name_}) - - set_property(GLOBAL APPEND PROPERTY FASTD_${TYPE}S ${name_}) endif(WITH_${TYPE}_${NAME}) endfunction(fastd_module) @@ -22,6 +21,7 @@ function(fastd_module_include_directories type name) string(TOUPPER "${type}" TYPE) string(REPLACE - _ name_ "${name}") + string(REPLACE " " _ name_ "${name_}") string(TOUPPER "${name_}" NAME) if(WITH_${TYPE}_${NAME}) @@ -33,6 +33,7 @@ function(fastd_module_link_libraries type name) string(TOUPPER "${type}" TYPE) string(REPLACE - _ name_ "${name}") + string(REPLACE " " _ name_ "${name_}") string(TOUPPER "${name_}" NAME) if(WITH_${TYPE}_${NAME}) -- cgit v1.2.3