[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  3677cff0a92fa78cec53ad86e4f9c56818cfb293 (commit)
      from  1095aeb680f1c6c2c411d80657e2c066bf7aa6d8 (commit)

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


- Log -----------------------------------------------------------------
commit 3677cff0a92fa78cec53ad86e4f9c56818cfb293
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 17:52:23 2010 -0300

    Add preliminary dependencies for Windows, still need to work on pjsip ones.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 78e76e9..3d9e467 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -32,10 +32,13 @@ function(pjproject_build PJPROJECT_COMPONENT)
       include_external_msproject(pjsip_simple "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_simple.vcproj")
       include_external_msproject(pjsip_ua "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_ua.vcproj")
       include_external_msproject(pjsua_lib "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsua_lib.vcproj")
+      add_dependencies(pjsip_core pjsip_simple pjsip_ua pjsua_lib)
     elseif (${PJPROJECT_COMPONENT} STREQUAL "pjmedia")
       include_external_msproject(pjmedia "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia.vcproj")
       include_external_msproject(pjmedia_audiodev "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia_audiodev.vcproj")
       include_external_msproject(srtp "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/srtp/libsrtp.vcproj")
+      add_dependencies(pjmedia pjmedia_audiodev srtp)
+    elseif (${PJPROJECT_COMPONENT} STREQUAL "third_party")
     else()
       include_external_msproject(${PJPROJECT_COMPONENT} "${CMAKE_SOURCE_DIR}/pjproject/${PJPROJECT_COMPONENT}/build/${PJPROJECT_COMPONENT}.vcproj")
     endif()
@@ -73,6 +76,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
   elseif (MSVC80 OR MSVC90)
     if (${PJPROJECT_COMPONENT} STREQUAL "pjsip")
     elseif (${PJPROJECT_COMPONENT} STREQUAL "pjlib-util")
+      add_dependencies(${COMPONENT} pjlib_util)
       if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
 	target_link_libraries(${COMPONENT} debug "pjlib-util-i386-Win32-vc8-Debug") 
 	target_link_libraries(${COMPONENT} optimized "pjlib-util-i386-Win32-vc8-Release")
@@ -86,6 +90,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
 	target_link_libraries(${COMPONENT} debug "libsrtp-i386-Win32-vc8-Debug") 
 	target_link_libraries(${COMPONENT} optimized "libsrtp-i386-Win32-vc8-Release")
       endif()
+      add_dependencies(${COMPONENT} pjmedia)
     else()
       if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
 	if (${PJPROJECT_COMPONENT} STREQUAL "pjlib")
@@ -94,6 +99,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
 	endif()
 	target_link_libraries(${COMPONENT} debug "${PJPROJECT_COMPONENT}-i386-Win32-vc8-Debug") 
 	target_link_libraries(${COMPONENT} optimized "${PJPROJECT_COMPONENT}-i386-Win32-vc8-Release")
+	add_dependencies(${COMPONENT} ${PJPROJECT_COMPONENT})
       endif()
     endif()
   endif()

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


-- 
asterisk-scf/release/cmake.git