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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  d4d49f5c2496c13ea85561bc6ec4254554c338aa (commit)
      from  2e337eb160277d12ca39fb90b7964d6c1f88d2b7 (commit)

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


- Log -----------------------------------------------------------------
commit d4d49f5c2496c13ea85561bc6ec4254554c338aa
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Mar 9 12:38:28 2011 -0600

    Changed slice dependency creation to support spaces and paths, and Drive Letter: paths for Windows.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 40a0d3b..0b4e3b9 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -546,12 +546,21 @@ function(asterisk_scf_component_add_one_slice COMPONENT SLICE)
             list(APPEND targets ${dep_targets})
 
             # parse sources
-            string(REGEX MATCHALL "[^:]+$" dep_sources "${dep}")
+	    string(REGEX MATCHALL  "^[^:]+" targstart "${dep}")
+	    string(REGEX REPLACE "^${targstart}:" "" dep_sources "${dep}")
+	    # replace the escaped spaces, leave the space separater.
+            string(REPLACE "\\ " "%20%" dep_sources "${dep_sources}") 
             string(REGEX MATCHALL "[^ ]+" dep_sources "${dep_sources}")
-            list(APPEND sources ${dep_sources})
+	    list(APPEND expsources ${dep_sources})
         endforeach()
     endif()
 
+    foreach(source ${expsources})
+	# put the spaces back in.
+        string(REPLACE "%20%" " " source ${source})
+    	list(APPEND sources ${source})
+    endforeach()
+
     # prepend the slice_out_dir to the targets
     foreach(target ${targets})
         list(APPEND generated_files "${slice_out_dir}/${target}")
@@ -576,7 +585,7 @@ function(asterisk_scf_component_add_one_slice COMPONENT SLICE)
         COMMAND ${SLICE_COMPILER} ${slice_compiler_arguments} ${SLICE}
         --output-dir ${slice_out_dir}
         COMMENT "slice2cpp translating ${SLICE}"
-        DEPENDS ${sources} ${SLICE_COMPILER})
+        DEPENDS ${sources})
 
     # the Slice and generated_files are sources for the component
     list(APPEND ${COMPONENT}_SOURCES ${SLICE} ${generated_files})

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


-- 
asterisk-scf/release/cmake.git