[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
Fri Oct 29 14:06:04 CDT 2010


branch "master" has been updated
       via  1af4041e6a8210e18b43437a60210cad8c2963c9 (commit)
      from  d8108e7dbd5e37e9023e62db8e51848dfff489cd (commit)

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


- Log -----------------------------------------------------------------
commit 1af4041e6a8210e18b43437a60210cad8c2963c9
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Oct 29 16:09:19 2010 -0300

    Link against IceUtil and pthread explicitly.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 7415c34..b56e21c 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -805,6 +805,13 @@ function(asterisk_scf_component_build_icebox COMPONENT)
 	list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
       endforeach()
     endif()
+    if(UNIX)
+      list(FIND target_libs Ice _Ice_FOUND)
+      if(_Ice_FOUND GREATER -1)
+        list(APPEND target_libs "IceUtil")
+	list(APPEND target_libs "pthread")
+      endif()
+    endif()
     target_link_libraries(${COMPONENT} ${${COMPONENT}_SLICES} ${target_libs})
   elseif(lang STREQUAL "CSharp")
     csharp_add_library(${COMPONENT} ${${COMPONENT}_SOURCES} REFERENCES ${${COMPONENT}_SLICES} ${target_libs})
@@ -837,6 +844,13 @@ function(asterisk_scf_component_build_standalone COMPONENT)
 	list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
       endforeach()
     endif()
+    if(UNIX)
+      list(FIND target_libs Ice _Ice_FOUND)
+      if(_Ice_FOUND GREATER -1)
+        list(APPEND target_libs "IceUtil")
+        list(APPEND target_libs "pthread")
+      endif()
+    endif()
     target_link_libraries(${COMPONENT} ${${COMPONENT}_SLICES} ${target_libs})
   elseif(lang STREQUAL "CSharp")
     csharp_add_executable(${COMPONENT} ${${COMPONENT}_SOURCES} REFERENCES ${${COMPONENT}_SLICES} ${target_libs})

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


-- 
asterisk-scf/release/cmake.git



More information about the asterisk-scf-commits mailing list