[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  98cbf4a0d71e2af47068d55a7bcbabf8616aff92 (commit)
      from  ea57b072d8f90982c9a97466dd5ec572cb9613df (commit)

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


- Log -----------------------------------------------------------------
commit 98cbf4a0d71e2af47068d55a7bcbabf8616aff92
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed Aug 18 16:36:19 2010 -0300

    Add some more dependencies to pjproject.cmake, and also build the third party components which are required by pjmedia.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 93a2aa7..055bfda 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -11,8 +11,23 @@ add_custom_target(pjproject-distclean COMMAND "make" "distclean" "TARGET_NAME=as
 # Function which adds build targets for the following supported pjproject components: pjlib, pjlib-util, pjnath, pjmedia, pjsip.
 function(pjproject_build PJPROJECT_COMPONENT)
   if (UNIX)
-    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_dependencies("pjproject-${PJPROJECT_COMPONENT}" "pjproject-pjlib")
+    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_dependencies("pjproject-${PJPROJECT_COMPONENT}" "pjproject-pjlib")
+    endif()
+    if (${PJPROJECT_COMPONENT} STREQUAL "pjsip")
+      pjproject_build(pjmedia)
+      add_dependencies("pjproject-pjsip" "pjproject-pjmedia")
+    elseif (${PJPROJECT_COMPONENT} STREQUAL "pjmedia")
+      pjproject_build(third_party)
+      pjproject_build(pjnath)
+      add_dependencies("pjproject-pjmedia" "pjproject-third_party" "pjproject-pjnath")
+    elseif (${PJPROJECT_COMPONENT} STREQUAL "pjnath")
+      pjproject_build(pjlib-util)
+      add_dependencies("pjproject-pjnath", "pjproject-pjlib-util")
+    endif()
   elseif (MSVC80 OR MSVC90)
     if (${PJPROJECT_COMPONENT} STREQUAL "pjlib-util")
       include_external_msproject(pjlib_util "${CMAKE_SOURCE_DIR}/pjproject/pjlib-util/build/pjlib_util.vcproj")

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


-- 
asterisk-scf/release/cmake.git