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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Dec 7 14:25:19 CST 2010


branch "master" has been updated
       via  cf93d3bec78f7efe4106e92a3a42e8a2846eae03 (commit)
      from  27ad6cf29c108f07b8b83eb24f5d37fb8a6efedc (commit)

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


- Log -----------------------------------------------------------------
commit cf93d3bec78f7efe4106e92a3a42e8a2846eae03
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Fri Dec 3 12:58:56 2010 -0600

    Manage boost link options in CMake.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index a7615c7..ccd9382 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -318,7 +318,7 @@ function(asterisk_scf_project NAME ICE_VERSION)
     project(${NAME} ${ARGN})
     # On Windows, IceBox C++ services must be compiled with some symbols exported;
     # the source code should use ASTERISK_SCF_ICEBOX_EXPORT to accomplish this, and this
-    # block will ensure it contains the correct value.
+    
     if(WIN32)
         message(STATUS "Setting ASTERISK_SCF_ICEBOX_EXPORT definition for Windows IceBox services")
         add_definitions(-DASTERISK_SCF_ICEBOX_EXPORT=__declspec\(dllexport\))
@@ -390,6 +390,8 @@ function(asterisk_scf_add_boost_libraries)
         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})
         list(APPEND libs ${lib})
@@ -810,6 +812,8 @@ function(asterisk_scf_component_add_boost_libraries COMPONENT)
         message(FATAL_ERROR "You must pass at least one library to this function")
     endif()
     set(libs ${${COMPONENT}_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})
         set(lang ${ASTERISK_SCF_${COMPONENT}_LANG})
         if(lang STREQUAL "CXX")

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list