[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  77e05f51eb35f8e0a8c567b950ba3f87966a9b14 (commit)
       via  c99df8440693ec556829afe1c439354520dc4cb9 (commit)
      from  38b89e6de2bc7749711b54457b8d9eb998d89ff3 (commit)

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


- Log -----------------------------------------------------------------
commit 77e05f51eb35f8e0a8c567b950ba3f87966a9b14
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Sep 16 16:04:13 2011 -0230

    Fix error in adding resampling library dependency.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 66e4f22..b72bec4 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -124,7 +124,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
       target_link_libraries(${COMPONENT} "pjsdp-asteriskscf")
       target_link_libraries(${COMPONENT} "pjmedia-audiodev-asteriskscf")
       target_link_libraries(${COMPONENT} "srtp-asteriskscf")
-      target_link_libraries(${COMPONENT} "resample")
+      target_link_libraries(${COMPONENT} "resample-asteriskscf")
       if(PJMEDIA_LIBRARIES)
 	target_link_libraries(${COMPONENT} ${PJMEDIA_LIBRARIES})
       endif()

commit c99df8440693ec556829afe1c439354520dc4cb9
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Sep 16 13:24:53 2011 -0230

    Add support for resampling library on Windows.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 8dd11c4..66e4f22 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -90,7 +90,8 @@ function(pjproject_build PJPROJECT_COMPONENT)
       include_external_msproject(pjmedia "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia.${VCPROJ_EXT}")
       include_external_msproject(pjmedia_audiodev "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia_audiodev.${VCPROJ_EXT}")
       include_external_msproject(srtp "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/srtp/libsrtp.${VCPROJ_EXT}")
-      add_dependencies(pjmedia pjmedia_audiodev srtp)
+      include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample_dll.${VCPROJ_EXT}")
+      add_dependencies(pjmedia pjmedia_audiodev srtp resample)
     elseif(${PJPROJECT_COMPONENT} STREQUAL "third_party")
     else()
       include_external_msproject(${PJPROJECT_COMPONENT} "${CMAKE_SOURCE_DIR}/pjproject/${PJPROJECT_COMPONENT}/build/${PJPROJECT_COMPONENT}.${VCPROJ_EXT}")
@@ -123,6 +124,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
       target_link_libraries(${COMPONENT} "pjsdp-asteriskscf")
       target_link_libraries(${COMPONENT} "pjmedia-audiodev-asteriskscf")
       target_link_libraries(${COMPONENT} "srtp-asteriskscf")
+      target_link_libraries(${COMPONENT} "resample")
       if(PJMEDIA_LIBRARIES)
 	target_link_libraries(${COMPONENT} ${PJMEDIA_LIBRARIES})
       endif()
@@ -165,6 +167,8 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
       target_link_libraries(${COMPONENT} optimized "pjmedia-audiodev-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
       target_link_libraries(${COMPONENT} debug "libsrtp-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Debug") 
       target_link_libraries(${COMPONENT} optimized "libsrtp-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
+      target_link_libraries(${COMPONENT} debug "libresample-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Debug") 
+      target_link_libraries(${COMPONENT} optimized "libresample-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
       add_dependencies(${COMPONENT} pjmedia)
     else()
       if(${CMAKE_CL_64})

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


-- 
asterisk-scf/release/cmake.git