[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  1fa680321d5fa626a2033b15a6421ed8e6ca26c8 (commit)
       via  bf8f6d83b4f2b3b25dbffe99b20982c9a1c34f39 (commit)
       via  c9b04d427e3afb9f0cdc08df0593069217d903d9 (commit)
       via  e28b4b692734af626abbec236f09535c450cfd30 (commit)
      from  a3271cd8dd6a62c34e48138b4af04705c3b9b042 (commit)

Summary of changes:
 cmake/AsteriskSCF.cmake |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 1fa680321d5fa626a2033b15a6421ed8e6ca26c8
Merge: c9b04d4 bf8f6d8
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 15:11:01 2011 -0500

    Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/cmake


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")

commit c9b04d427e3afb9f0cdc08df0593069217d903d9
Merge: a3271cd e28b4b6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 14:59:48 2011 -0500

    Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/cmake


commit e28b4b692734af626abbec236f09535c450cfd30
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Jun 23 14:57:49 2011 -0500

    Ensure that bare filenames are properly converted to absolute paths.
    
    Some versions of CMake don't expand a bare filename into a full path when
    get_filename_component(REALPATH) is called, even though they should. In order
    to work around this bug, in __astscf_ensure_abs_paths, the script will now
    check for a bare filename as input, and if one is found, CMAKE_CURRENT_SOURCE_DIR
    will be prepended to the input filename.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 70fa132..c89a042 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -417,14 +417,17 @@ function(astscf_project NAME ICE_VERSION)
 endfunction()
 
 # Ensures that a list of paths are all absolute paths.
-macro(__astscf_ensure_abs_paths pathlist)
-  unset(eap_temp)
+function(__astscf_ensure_abs_paths pathlist)
   foreach(p ${${pathlist}})
+    get_filename_component(inpath "${p}" PATH)
+    if(NOT inpath)
+      set(p "${CMAKE_CURRENT_SOURCE_DIR}/${p}")
+    endif()
     get_filename_component(newpath "${p}" REALPATH)
     list(APPEND eap_temp "${newpath}")
   endforeach()
-  set(${pathlist} ${eap_temp})
-endmacro()
+  set(${pathlist} ${eap_temp} PARENT_SCOPE)
+endfunction()
 
 # Function which initializes a component for building
 function(astscf_component_init COMPONENT)

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


-- 
asterisk-scf/integration/gitall.git