[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a66cedb762fb1d0ebccf2d7e765e594c56f5b679 (commit)
       via  50e39176d1234692cc502548eaac895c7642f6d8 (commit)
      from  2c3865792aecb420f6cdaf701769ec2943f9ab8d (commit)

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


- Log -----------------------------------------------------------------
commit a66cedb762fb1d0ebccf2d7e765e594c56f5b679
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Feb 8 13:11:19 2012 -0330

    Change name of library for pjproject's resample lib.

diff --git a/cmake/modules/pjproject.cmake b/cmake/modules/pjproject.cmake
index b72bec4..4fdcdef 100644
--- a/cmake/modules/pjproject.cmake
+++ b/cmake/modules/pjproject.cmake
@@ -90,7 +90,7 @@ 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}")
-      include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample_dll.${VCPROJ_EXT}")
+      include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample.${VCPROJ_EXT}")
       add_dependencies(pjmedia pjmedia_audiodev srtp resample)
     elseif(${PJPROJECT_COMPONENT} STREQUAL "third_party")
     else()

commit 50e39176d1234692cc502548eaac895c7642f6d8
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Feb 7 16:49:56 2012 -0330

    Allowing test timeouts to be overridden in the target's CMakeLists.txt file.

diff --git a/cmake/AsteriskSCF.cmake b/cmake/AsteriskSCF.cmake
index d699e31..2d046ba 100644
--- a/cmake/AsteriskSCF.cmake
+++ b/cmake/AsteriskSCF.cmake
@@ -1117,6 +1117,9 @@ function(astscf_test_boost NAME)
   set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
   file(MAKE_DIRECTORY "${project_test_results}")
   file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+  if(LOCAL_TIMEOUT_OVERRIDE)
+    set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+  endif()
   __astscf_set_test_props("${NAME}" "${project_test_results}")
 endfunction()
 
@@ -1126,5 +1129,8 @@ function(astscf_test_icebox NAME CONFIG)
   set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
   file(MAKE_DIRECTORY "${project_test_results}")
   file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+  if(LOCAL_TIMEOUT_OVERRIDE)
+    set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+  endif()
   __astscf_set_test_props("${NAME}" "${project_test_results}")
 endfunction()

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


-- 
asterisk-scf/integration/gitall.git