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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue May 10 15:03:06 CDT 2011


branch "master" has been updated
       via  1178a5061d81b691a58ffc2ac79be859a5feeade (commit)
      from  f268b4a8686fa136d4b6a4894d7232a439cf0b6f (commit)

Summary of changes:
 src/CMakeLists.txt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 1178a5061d81b691a58ffc2ac79be859a5feeade
Author: Joshua Colp <jcolp at digium.com>
Date:   Tue May 10 17:03:06 2011 -0300

    Link against OpenSSL if present for TLS support within pjproject.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 254d404..c56d46f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
 if(NOT logger_dir)
   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
 endif()
+
+# TLS support within pjsip uses OpenSSL, so if found we need to link it in
+find_package(OpenSSL)
+if(OPENSSL_FOUND)
+  include_directories(${OPENSSL_INCLUDE_DIR})
+endif()
+
 include_directories(${logger_dir}/include)
 include_directories(${utils_dir}/StateReplicator/include)
 include_directories(${utils_dir}/SmartProxy/include)
@@ -40,7 +47,7 @@ asterisk_scf_component_add_slice(SipSessionManager ../local-slice/SipConfigurati
 asterisk_scf_component_add_ice_libraries(SipSessionManager IceStorm)
 asterisk_scf_component_add_boost_libraries(SipSessionManager core)
 asterisk_scf_component_build_icebox(SipSessionManager)
-target_link_libraries(SipSessionManager logging-client)
+target_link_libraries(SipSessionManager logging-client ${OPENSSL_LIBRARIES})
 pjproject_link(SipSessionManager pjsip)
 pjproject_link(SipSessionManager pjmedia)
 pjproject_link(SipSessionManager pjlib-util)

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


-- 
asterisk-scf/release/sip.git



More information about the asterisk-scf-commits mailing list