[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "slice-plugins" created.

[Commits to the Asterisk SCF project code repositories]

branch "slice-plugins" has been created
        at  a00c61f2e1322dd57647b39d57167733b4f385d9 (commit)

- Log -----------------------------------------------------------------
commit a00c61f2e1322dd57647b39d57167733b4f385d9
Merge: 4adddee 5f41415
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jan 7 11:07:35 2011 -0600

    Merge remote branch 'origin/master' into slice-plugins


commit 4adddee7a420564706ad492054ea08c43292ccef
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 4 06:58:33 2011 -0600

    Add support for Slice translator plugins.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 73dfa67..3abbeb5 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -413,7 +413,19 @@ macro(ensure_abs_paths pathlist)
     set(${pathlist} ${eap_temp})
 endmacro()
 
-# Function which remembers include directories needed for a particular Slice target
+function(asterisk_scf_slice_plugins)
+    if(NOT ARGN)
+        message(FATAL_ERROR "You must pass at least one plugin to this function")
+    endif()
+    set(plugins ${SLICE_PLUGINS})
+    foreach(plugin ${ARGN})
+      list(APPEND plugins ${plugin})
+    endforeach()
+    list(REMOVE_DUPLICATES plugins)
+    set(SLICE_PLUGINS ${plugins} PARENT_SCOPE)
+endfunction()
+
+# Function which remembers include directories needed by a Slice target
 function(asterisk_scf_slice_include_directories)
     set(paths ${ARGN})
     ensure_abs_paths(paths)
@@ -424,7 +436,7 @@ function(asterisk_scf_slice_include_directories)
     set(SLICE_INCLUDE_DIRECTORIES ${paths} PARENT_SCOPE)
 endfunction()
 
-# Function which remembers definitions needed for a particular Slice target
+# Function which remembers definitions needed by a Slice target
 function(asterisk_scf_slice_compile_definitions SLICE_FILE)
     get_filename_component(SLICE ${SLICE_FILE} NAME_WE)
     set(SLICE_COMPILE_DEFINITIONS_${SLICE} ${ARGN} PARENT_SCOPE)
@@ -452,7 +464,7 @@ function(asterisk_scf_slice_add_ice_libraries TARGET)
     set(${TARGET}_ICE_LIBRARIES ${libs} PARENT_SCOPE)
 endfunction()
 
-# Function which adds a dependency for a Slice definition
+# Function which remembers dependencies for a Slice target
 function(asterisk_scf_slice_add_dependencies TARGET)
     if(NOT ARGN)
         message(FATAL_ERROR "You must pass at least one dependency to this function")
@@ -548,6 +560,11 @@ function(asterisk_scf_compile_slice TARGET_IN DIR_IN DESC_IN GROUP_IN)
     if(ICE_SLICE_DIR)
         list(APPEND slice_compiler_arguments "-I${ICE_SLICE_DIR}")
     endif()
+    if(SLICE_PLUGINS)
+      foreach(plugin ${SLICE_PLUGINS})
+	list(APPEND slice_compiler_arguments "--plugin=${plugin}")
+      endforeach()
+    endif()
     foreach(include ${SLICE_INCLUDE_DIRECTORIES})
         # Each directory in this list will be in the source tree,
         # which is what the Slice compiler will need

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


-- 
asterisk-scf/release/cmake.git