[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  e645957c74f6bc2ae22622e2b3bd975842025915 (commit)
      from  93a52a5b66528bc91f5b105a965e67095c8ec9de (commit)

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


- Log -----------------------------------------------------------------
commit e645957c74f6bc2ae22622e2b3bd975842025915
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Jan 7 10:57:21 2011 -0400

    Link against the right libraries for MSVC++ 10.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index bd9a319..d60c484 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -107,32 +107,37 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
       target_link_libraries(${COMPONENT} "${PJPROJECT_COMPONENT}-asteriskscf")
     endif()
   elseif(MSVC80 OR MSVC90 OR MSVC10)
+    if(MSVC10)
+        set(MSVC_VERSION "vc10")
+    else()
+        set(MSVC_VERSION "vc8")
+    endif()
     if(${PJPROJECT_COMPONENT} STREQUAL "pjsip")
       if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
-	target_link_libraries(${COMPONENT} debug "pjsip-core-i386-Win32-vc8-Debug")
-	target_link_libraries(${COMPONENT} optimized "pjsip-core-i386-Win32-vc8-Release")
-	target_link_libraries(${COMPONENT} debug "pjsip-simple-i386-Win32-vc8-Debug")
-	target_link_libraries(${COMPONENT} optimized "pjsip-simple-i386-Win32-vc8-Release")
-	target_link_libraries(${COMPONENT} debug "pjsip-ua-i386-Win32-vc8-Debug")
-	target_link_libraries(${COMPONENT} optimized "pjsip-ua-i386-Win32-vc8-Release")
-	target_link_libraries(${COMPONENT} debug "pjsua-lib-i386-Win32-vc8-Debug")
-	target_link_libraries(${COMPONENT} optimized "pjsua-lib-i386-Win32-vc8-Release")
+	target_link_libraries(${COMPONENT} debug "pjsip-core-i386-Win32-${MSVC_VERSION}-Debug")
+	target_link_libraries(${COMPONENT} optimized "pjsip-core-i386-Win32-${MSVC_VERSION}-Release")
+	target_link_libraries(${COMPONENT} debug "pjsip-simple-i386-Win32-${MSVC_VERSION}-Debug")
+	target_link_libraries(${COMPONENT} optimized "pjsip-simple-i386-Win32-${MSVC_VERSION}-Release")
+	target_link_libraries(${COMPONENT} debug "pjsip-ua-i386-Win32-${MSVC_VERSION}-Debug")
+	target_link_libraries(${COMPONENT} optimized "pjsip-ua-i386-Win32-${MSVC_VERSION}-Release")
+	target_link_libraries(${COMPONENT} debug "pjsua-lib-i386-Win32-${MSVC_VERSION}-Debug")
+	target_link_libraries(${COMPONENT} optimized "pjsua-lib-i386-Win32-${MSVC_VERSION}-Release")
       endif()
       add_dependencies(${COMPONENT} pjsip_core pjsip_simple pjsip_ua pjsua_lib)
     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")
+	target_link_libraries(${COMPONENT} debug "pjlib-util-i386-Win32-${MSVC_VERSION}-Debug") 
+	target_link_libraries(${COMPONENT} optimized "pjlib-util-i386-Win32-${MSVC_VERSION}-Release")
       endif()
     elseif(${PJPROJECT_COMPONENT} STREQUAL "pjmedia")
       if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
-	target_link_libraries(${COMPONENT} debug "pjmedia-i386-Win32-vc8-Debug") 
-	target_link_libraries(${COMPONENT} optimized "pjmedia-i386-Win32-vc8-Release")
-	target_link_libraries(${COMPONENT} debug "pjmedia-audiodev-i386-Win32-vc8-Debug") 
-	target_link_libraries(${COMPONENT} optimized "pjmedia-audiodev-i386-Win32-vc8-Release")
-	target_link_libraries(${COMPONENT} debug "libsrtp-i386-Win32-vc8-Debug") 
-	target_link_libraries(${COMPONENT} optimized "libsrtp-i386-Win32-vc8-Release")
+	target_link_libraries(${COMPONENT} debug "pjmedia-i386-Win32-${MSVC_VERSION}-Debug") 
+	target_link_libraries(${COMPONENT} optimized "pjmedia-i386-Win32-${MSVC_VERSION}-Release")
+	target_link_libraries(${COMPONENT} debug "pjmedia-audiodev-i386-Win32-${MSVC_VERSION}-Debug") 
+	target_link_libraries(${COMPONENT} optimized "pjmedia-audiodev-i386-Win32-${MSVC_VERSION}-Release")
+	target_link_libraries(${COMPONENT} debug "libsrtp-i386-Win32-${MSVC_VERSION}-Debug") 
+	target_link_libraries(${COMPONENT} optimized "libsrtp-i386-Win32-${MSVC_VERSION}-Release")
       endif()
       add_dependencies(${COMPONENT} pjmedia)
     else()
@@ -141,8 +146,8 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
 	  # pjlib has the additional requirement of winsock2
 	  target_link_libraries(${COMPONENT} "ws2_32")
 	endif()
-	target_link_libraries(${COMPONENT} debug "${PJPROJECT_COMPONENT}-i386-Win32-vc8-Debug") 
-	target_link_libraries(${COMPONENT} optimized "${PJPROJECT_COMPONENT}-i386-Win32-vc8-Release")
+	target_link_libraries(${COMPONENT} debug "${PJPROJECT_COMPONENT}-i386-Win32-${MSVC_VERSION}-Debug") 
+	target_link_libraries(${COMPONENT} optimized "${PJPROJECT_COMPONENT}-i386-Win32-${MSVC_VERSION}-Release")
 	add_dependencies(${COMPONENT} ${PJPROJECT_COMPONENT})
       endif()
     endif()

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


-- 
asterisk-scf/release/cmake.git