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

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


- Log -----------------------------------------------------------------
commit 93a52a5b66528bc91f5b105a965e67095c8ec9de
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Jan 7 09:36:24 2011 -0400

    MSVC++ 2010 project files use the vcxproj file extension, not vcproj.

diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index b166c68..bd9a319 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -50,22 +50,27 @@ function(pjproject_build PJPROJECT_COMPONENT)
       add_dependencies("pjproject-pjnath", "pjproject-pjlib-util")
     endif()
   elseif(MSVC80 OR MSVC90 OR MSVC10)
+    if(MSVC10)
+        set(VCPROJ_EXT "vcxproj")
+    else()
+        set(VCPROJ_EXT "vcproj")
+    endif()
     if(${PJPROJECT_COMPONENT} STREQUAL "pjlib-util")
-      include_external_msproject(pjlib_util "${CMAKE_SOURCE_DIR}/pjproject/pjlib-util/build/pjlib_util.vcproj")
+      include_external_msproject(pjlib_util "${CMAKE_SOURCE_DIR}/pjproject/pjlib-util/build/pjlib_util.${VCPROJ_EXT}")
     elseif(${PJPROJECT_COMPONENT} STREQUAL "pjsip")
-      include_external_msproject(pjsip_core "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_core.vcproj")
-      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")
+      include_external_msproject(pjsip_core "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_core.${VCPROJ_EXT}")
+      include_external_msproject(pjsip_simple "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_simple.${VCPROJ_EXT}")
+      include_external_msproject(pjsip_ua "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsip_ua.${VCPROJ_EXT}")
+      include_external_msproject(pjsua_lib "${CMAKE_SOURCE_DIR}/pjproject/pjsip/build/pjsua_lib.${VCPROJ_EXT}")
       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")
+      include_external_msproject(pjmedia "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia.${VCPROJ_EXT}")
+      include_external_msproject(pjmedia_audiodev "${CMAKE_SOURCE_DIR}/pjproject/pjmedia/build/pjmedia_audiodev.${VCPROJ_EXT}")
+      include_external_msproject(srtp "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/srtp/libsrtp.${VCPROJ_EXT}")
       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")
+      include_external_msproject(${PJPROJECT_COMPONENT} "${CMAKE_SOURCE_DIR}/pjproject/${PJPROJECT_COMPONENT}/build/${PJPROJECT_COMPONENT}.${VCPROJ_EXT}")
     endif()
   else()
     message(STATUS "Unfortunately you are building on a platform which does not support automatic pjproject building. You will have to build pjproject manually.")

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


-- 
asterisk-scf/release/cmake.git