[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  81af25d5567e8b542f7068ad9d94affba8a72fe7 (commit)
      from  c6c5985079c75e76a68d1d9b8626d11bcf087ae4 (commit)

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


- Log -----------------------------------------------------------------
commit 81af25d5567e8b542f7068ad9d94affba8a72fe7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Thu Nov 18 11:54:00 2010 -0600

    Update prproject support for pjproject-1.8.5.
    
    The 1.8.5 release of pjproject includes some build system changes
    that affect our usage of it; it is now necessary to specify the
    'build' subdirectory when requesting that a specific component
    be built via the DIRS variable. Since we are now building against
    pjproject from our own repository, we can be sure it will be at
    least version 1.8.5, so this commit changes pjproject.cmake to
    work properly with the new version.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index f2f5139..ee481d0 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -39,7 +39,7 @@ function(pjproject_build PJPROJECT_COMPONENT)
     if(${PJPROJECT_COMPONENT} STREQUAL "third_party")
       add_custom_target("pjproject-third_party" COMMAND "make" "TARGET_NAME=asteriskscf" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject/third_party/build" COMMENT "Building pjproject third party components")
     else()
-      add_custom_target("pjproject-${PJPROJECT_COMPONENT}" COMMAND "make" "TARGET_NAME=asteriskscf" "DIRS=${PJPROJECT_COMPONENT}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Building pjproject-${PJPROJECT_COMPONENT}" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h")
+      add_custom_target("pjproject-${PJPROJECT_COMPONENT}" COMMAND "make" "TARGET_NAME=asteriskscf" "DIRS=${PJPROJECT_COMPONENT}/build" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/pjproject" COMMENT "Building pjproject-${PJPROJECT_COMPONENT}" DEPENDS "${CMAKE_SOURCE_DIR}/pjproject/pjlib/include/pj/config_site.h")
       add_dependencies("pjproject-${PJPROJECT_COMPONENT}" "pjproject-pjlib")
     endif()
     if(${PJPROJECT_COMPONENT} STREQUAL "pjsip")

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


-- 
asterisk-scf/release/cmake.git