[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  1095aeb680f1c6c2c411d80657e2c066bf7aa6d8 (commit)
       via  2d9a6cedac126d8091d64e36dac0adf00c66d399 (commit)
      from  44414a3af228fc551c19485018373ba997a3c7b0 (commit)

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


- Log -----------------------------------------------------------------
commit 1095aeb680f1c6c2c411d80657e2c066bf7aa6d8
Merge: 2d9a6ce 44414a3
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 14:48:39 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/cmake


commit 2d9a6cedac126d8091d64e36dac0adf00c66d399
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 14:48:04 2010 -0300

    Remove automatic building of required pjproject components. This makes cmake unhappy if you try to duplicate targets.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 055bfda..78e76e9 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -18,14 +18,10 @@ function(pjproject_build PJPROJECT_COMPONENT)
       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)

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


-- 
asterisk-scf/release/cmake.git