[asterisk-scf-commits] asterisk-scf/integration/cmake.git branch "disintegrated-build" updated.

[Commits to the Asterisk SCF project code repositories]

branch "disintegrated-build" has been updated
       via  f82a0f8c1bd09b5658e43fb7235a780d52af3336 (commit)
      from  f9d445d4e4ed62e1b57c4f7deefb1000a843340d (commit)

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


- Log -----------------------------------------------------------------
commit f82a0f8c1bd09b5658e43fb7235a780d52af3336
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Mar 30 15:43:45 2011 -0500

    Use new --depend-header argument to slice2cpp to simplify code.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index f64952f..ddb39bc 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -506,7 +506,7 @@ function(__component_add_one_slice COMPONENT SLICE)
     endif()
 
     get_filename_component(slice_basename "${SLICE}" NAME_WE)
-    message(STATUS "Adding ${slice_basename} to ${COMPONENT}")
+    message(STATUS "Adding ${SLICE} to ${COMPONENT}")
 
     # fully specify SLICE's path
     set(slice_full_path "${CMAKE_CURRENT_SOURCE_DIR}/${SLICE}")
@@ -515,7 +515,7 @@ function(__component_add_one_slice COMPONENT SLICE)
     # since the target was just added
     message(STATUS "Determining dependencies for ${slice_basename}")
     execute_process(
-        COMMAND ${SLICE_COMPILER} ${slice_compiler_arguments} --depend ${slice_full_path}
+        COMMAND ${SLICE_COMPILER} ${slice_compiler_arguments} --depend-header ${slice_full_path}
         OUTPUT_VARIABLE raw_dependencies
         ERROR_VARIABLE slice_errors)
     if(slice_errors)
@@ -572,9 +572,6 @@ function(__component_add_one_slice COMPONENT SLICE)
     foreach(target ${targets})
         list(APPEND generated_files "${slice_out_dir}/${target}")
     endforeach()
-    # slice2cpp doesn't generate a dep for the .h file, so add one
-    list(APPEND generated_files "${slice_out_dir}/${slice_basename}.h")
-    # and be resilient in case it does so in the future...
     list(REMOVE_DUPLICATES generated_files)
     set_source_files_properties(${generated_files} PROPERTIES GENERATED 1)
 

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


-- 
asterisk-scf/integration/cmake.git