[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jun 23 15:11:00 CDT 2011


branch "master" has been updated
       via  bf8f6d83b4f2b3b25dbffe99b20982c9a1c34f39 (commit)
      from  e28b4b692734af626abbec236f09535c450cfd30 (commit)

Summary of changes:
 AsteriskSCF.cmake |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit bf8f6d83b4f2b3b25dbffe99b20982c9a1c34f39
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 15:09:43 2011 -0500

    Convert __astscf_append_to_var() to a function.
    
    This did not need to be a macro, and since macro scoping and argument rules
    in CMake are very strange, it's better for it to be a function.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index c89a042..0811c79 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -103,13 +103,12 @@ function(__astscf_set_cache_string var value reason)
   endforeach()
 endfunction()
 
-macro(__astscf_append_to_var VAR)
-  unset(_altv)
+function(__astscf_append_to_var VAR)
   foreach(item ${ARGN})
     set(_altv "${_altv} ${item}")
   endforeach()
   set(${VAR} "${${VAR}} ${_altv}" PARENT_SCOPE)
-endmacro()
+endfunction()
 
 # installation directories (these are all relative to ${CMAKE_INSTALL_PREFIX})
 __astscf_set_cache_path(INSTALL_SYS_CONF_DIR etc "read-only data files that pertain to a single machine")

-----------------------------------------------------------------------


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list