[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  fbeb05989f3b1fe4ef06be4cb587c87b6d00a947 (commit)
      from  8e78a92dc7e126ef2770fbf3c5952abfae69d99b (commit)

Summary of changes:
 AsteriskSCF.cmake |   38 +-------------------------------------
 1 files changed, 1 insertions(+), 37 deletions(-)


- Log -----------------------------------------------------------------
commit fbeb05989f3b1fe4ef06be4cb587c87b6d00a947
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Apr 27 13:55:46 2011 -0500

    Remove support for adding Boost and/or Ice libraries to all components in a
    directory and its children; it's easy enough to add them to the components
    that need them, so the shotgun approach doesn't save much time and it results
    in components being linked to libraries they don't actually use.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 78a975f..52a5430 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -405,26 +405,6 @@ function(find_Boost_library LIBRARY)
     endif()
 endfunction()
 
-# Function which adds Boost libraries to all components in the current
-# directory and below
-function(asterisk_scf_add_boost_libraries)
-    if(NOT ARGN)
-        message(FATAL_ERROR "You must pass at least one library to this function")
-    endif()
-    set(libs ${ASTERISK_SCF_BOOST_LIBRARIES})
-    # By default we are disabling boost auto-linking and specifying dynamic linking.
-    add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_ALL_DYN_LINK)
-    foreach(lib ${ARGN})
-        find_Boost_library(${lib})
-	string(TOUPPER "${lib}" lib)
-        list(APPEND libs ${lib})
-    endforeach()
-    list(REMOVE_DUPLICATES libs)
-    set(ASTERISK_SCF_BOOST_LIBRARIES ${libs} PARENT_SCOPE)
-    include_directories(SYSTEM ${Boost_INCLUDE_DIR})
-    link_directories(${Boost_LIBRARY_DIRS})
-endfunction()
-
 # Function which adds Boost libraries needed by a component
 function(asterisk_scf_component_add_boost_libraries COMPONENT)
     if(NOT ARGN)
@@ -509,23 +489,7 @@ function(asterisk_scf_component_add_file COMPONENT)
     set(${COMPONENT}_SOURCES ${file_list} PARENT_SCOPE)
 endfunction()
 
-# Function which adds Ice libraries to all components in the current
-# directory and below
-function(asterisk_scf_add_ice_libraries)
-    if(NOT ARGN)
-        message(FATAL_ERROR "You must pass at least one library to this function")
-    endif()
-    set(libs ${ASTERISK_SCF_ICE_LIBRARIES})
-    foreach(lib ${ARGN})
-        find_package(Ice REQUIRED ${lib})
-	string(TOUPPER "${lib}" lib)
-        list(APPEND libs ${lib})
-    endforeach()
-    list(REMOVE_DUPLICATES libs)
-    set(ASTERISK_SCF_ICE_LIBRARIES ${libs} PARENT_SCOPE)
-endfunction()
-
-# Function which adds Ice libraries needed by a component
+# Function which remembers Ice libraries needed by a component
 function(asterisk_scf_component_add_ice_libraries COMPONENT)
     if(NOT ARGN)
         message(FATAL_ERROR "You must pass at least one library to this function")

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


-- 
asterisk-scf/release/cmake.git