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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Mon Jan 17 15:30:38 CST 2011


branch "ice-package" has been updated
       via  4834ef8baf8ea64850b9761a4d36c86029eacab9 (commit)
       via  705c1a076b73351077992e4336109291f0ef5bb7 (commit)
      from  577cfc3d97ca02e8c46c91a144b0c1bb14ddb786 (commit)

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


- Log -----------------------------------------------------------------
commit 4834ef8baf8ea64850b9761a4d36c86029eacab9
Merge: 577cfc3 705c1a0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Jan 17 15:30:34 2011 -0600

    Merge branch 'master' into ice-package

diff --cc AsteriskSCF.cmake
index 55f5ef8,5f94b18..a138da9
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@@ -372,10 -498,12 +372,10 @@@ function(asterisk_scf_component_add_ice
          list(APPEND libs ${lib})
      endforeach()
      list(REMOVE_DUPLICATES libs)
 -    set(${COMPONENT}_BOOST_LIBRARIES ${libs} PARENT_SCOPE)
 -    include_directories(${Boost_INCLUDE_DIR})
 -    link_directories(${Boost_LIBRARY_DIRS})
 +    set(${COMPONENT}_ICE_LIBRARIES ${libs} PARENT_SCOPE)
  endfunction()
  
- # Adds a slice file to a target.  This handles all the magic of creating the
+ # Adds slice files to a target.  This handles all the magic of creating the
  # rules to run slice2cpp, adding the generated headers to the include path,
  # adding the generated .cpp file to the component, etc.  The generated files
  # are placed in ${CMAKE_CURRENT_BINARY_DIR}/generated.

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list