[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  7395eabe3b4e9e99fa368617b173e0360e932b92 (commit)
       via  bbbe7ebd7d1916aeacd5db79c5e5f3af35c8377e (commit)
      from  6a530d70135a207183ad66df86e6ee058dc0b616 (commit)

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


- Log -----------------------------------------------------------------
commit 7395eabe3b4e9e99fa368617b173e0360e932b92
Author: David M. Lee <dlee at digium.com>
Date:   Thu Nov 11 14:38:11 2010 -0600

    Enabling proper threading support for Solaris.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index ac459b7..8ebd878 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -59,6 +59,14 @@ if(NOT CMAKE_BUILD_TYPE)
         FORCE)
 endif()
 
+# threading support required
+find_package(Threads REQUIRED)
+
+if(CMAKE_SYSTEM MATCHES "SunOS.*")
+    set(CMAKE_CXX_FLAGS "-pthreads ")
+endif()
+
+
 if(WIN32)
     message(WARNING "Profile builds not supported")
 else()

commit bbbe7ebd7d1916aeacd5db79c5e5f3af35c8377e
Author: David M. Lee <dlee at digium.com>
Date:   Thu Nov 11 10:34:10 2010 -0600

    In my prior 'fix', I actually broke how we linked to Boost.
    
    I was wrong in assuming that specifying libs by full path was a bad
    thing.  It actually wasn't the cause of the linker errors we were
    seeing on Solaris.
    
    Revert "Fixed solaris build: specify boost libs using -l"
    
    This reverts commit 5d28e94e0f3e7f7b1a73b8c4922083d4ece5d46d.
    
    Conflicts:
    
    	AsteriskSCF.cmake

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 01c1baa..ac459b7 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -811,15 +811,8 @@ function(asterisk_scf_component_build_icebox COMPONENT)
         if(boostlibs)
             list(REMOVE_DUPLICATES boostlibs)
             foreach(lib ${boostlibs})
-	        if(UNIX)
-	            if(NOT "core" STREQUAL "${lib}")
-	                list(APPEND target_libs "boost_${lib}")
-	            endif()
-	            link_directories(${Boost_LIBRARY_DIRS})
-	        else()
-	            string(TOUPPER ${lib} libtag)
-	            list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
-	        endif()
+	        string(TOUPPER ${lib} libtag)
+	        list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
             endforeach()
         endif()
         if(UNIX)
@@ -857,15 +850,8 @@ function(asterisk_scf_component_build_standalone COMPONENT)
         if(boostlibs)
             list(REMOVE_DUPLICATES boostlibs)
             foreach(lib ${boostlibs})
-	        if(UNIX)
-	            if(NOT "core" STREQUAL "${lib}")
-	                list(APPEND target_libs "boost_${lib}")
-	            endif()
-	            link_directories(${Boost_LIBRARY_DIRS})
-	        else()
-	            string(TOUPPER ${lib} libtag)
-	            list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
-	        endif()
+	        string(TOUPPER ${lib} libtag)
+	        list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
             endforeach()
         endif()
         if(UNIX)
@@ -907,15 +893,8 @@ function(asterisk_scf_component_build_library COMPONENT)
         if(boostlibs)
             list(REMOVE_DUPLICATES boostlibs)
             foreach(lib ${boostlibs})
-	        if(UNIX)
-	            if(NOT "core" STREQUAL "${lib}")
-	                list(APPEND target_libs "boost_${lib}")
-	            endif()
-	            link_directories(${Boost_LIBRARY_DIRS})
-	        else()
-	            string(TOUPPER ${lib} libtag)
-	            list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
-	        endif()
+	        string(TOUPPER ${lib} libtag)
+	        list(APPEND target_libs "${Boost_${libtag}_LIBRARY}")
             endforeach()
         endif()
         target_link_libraries(${COMPONENT} ${${COMPONENT}_SLICES} ${target_libs})

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


-- 
asterisk-scf/release/cmake.git