[asterisk-scf-commits] asterisk-scf/integration/cmake.git branch "slice-plugins" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 17:08:26 UTC 2011
branch "slice-plugins" has been updated
via a00c61f2e1322dd57647b39d57167733b4f385d9 (commit)
via 5f41415fd3e416970f90b5242213aa48f43a46d4 (commit)
via e8a3fb604f5cbb8724fb208faac3fd61a7c57c7e (commit)
via e645957c74f6bc2ae22622e2b3bd975842025915 (commit)
via 93a52a5b66528bc91f5b105a965e67095c8ec9de (commit)
via 2bea97e25572f2b3e63606670ebb2b3b3728d312 (commit)
via a25745891bf9113a35b2081966fb3efdb7d68fff (commit)
from 4adddee7a420564706ad492054ea08c43292ccef (commit)
Summary of changes:
init-cmake.sh | 20 +++++++++-----
modules/pjproject.cmake | 68 +++++++++++++++++++++++++++--------------------
2 files changed, 52 insertions(+), 36 deletions(-)
- Log -----------------------------------------------------------------
commit a00c61f2e1322dd57647b39d57167733b4f385d9
Merge: 4adddee 5f41415
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 11:07:35 2011 -0600
Merge remote branch 'origin/master' into slice-plugins
commit 5f41415fd3e416970f90b5242213aa48f43a46d4
Merge: e8a3fb6 e645957
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 11:07:05 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/cmake
Conflicts:
init-cmake.sh
diff --cc init-cmake.sh
index dcd1154,2e9b784..1eb0bd7
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@@ -83,7 -81,7 +83,7 @@@ while test $# -gt 0; d
shift
;;
--nmake)
- cmake_output="Visual Studio 9 2008"
- add_cmake_args -G "NMake Makefiles"
++ cmake_output="NMake Makefiles"
shift
;;
--subdir)
commit e8a3fb604f5cbb8724fb208faac3fd61a7c57c7e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jan 7 11:05:00 2011 -0600
Don't tell CMake two output types when one is explicitly specified
on Windows platforms.
diff --git a/init-cmake.sh b/init-cmake.sh
index f9b20e8..dcd1154 100755
--- a/init-cmake.sh
+++ b/init-cmake.sh
@@ -37,6 +37,8 @@ subdir=false
cmake_args=()
# source directory
srcdir=..
+# cmake output type (default is platform specific, see below)
+cmake_output=
function add_cmake_args()
{
@@ -53,7 +55,7 @@ esac
case $platform in
win*) # for windows, default to VS9
- add_cmake_args -G "Visual Studio 9 2008"
+ cmake_output="Visual Studio 9 2008"
;;
esac
@@ -61,27 +63,27 @@ esac
while test $# -gt 0; do
case $1 in
--vs9)
- add_cmake_args -G "Visual Studio 9 2008"
+ cmake_output="Visual Studio 9 2008"
shift
;;
--vs9-64)
- add_cmake_args -G "Visual Studio 9 2008 Win64"
+ cmake_output="Visual Studio 9 2008 Win64"
shift
;;
--vs10)
- add_cmake_args -G "Visual Studio 10"
+ cmake_output="Visual Studio 10"
shift
;;
--vs10-64)
- add_cmake_args -G "Visual Studio 10 Win64"
+ cmake_output="Visual Studio 10 Win64"
shift
;;
--make)
- add_cmake_args -G "Unix Makefiles"
+ cmake_output="Unix Makefiles"
shift
;;
--nmake)
- add_cmake_args -G "Visual Studio 9 2008"
+ cmake_output="Visual Studio 9 2008"
shift
;;
--subdir)
@@ -107,6 +109,10 @@ while test $# -gt 0; do
esac
done
+if [ -n "${cmake_output}" ]; then
+ add_cmake_args -G ${cmake_output}
+fi
+
if ! test -f CMakeLists.txt; then
echo "CMakeLists.txt missing. Must be run from a CMake build directory." >&2
exit 1
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()
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.")
commit 2bea97e25572f2b3e63606670ebb2b3b3728d312
Author: Joshua Colp <jcolp at digium.com>
Date: Fri Jan 7 09:13:26 2011 -0400
Link against the pjproject stuff under MSVC++ 2010 as well.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index c6bcf87..b166c68 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -101,7 +101,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
else()
target_link_libraries(${COMPONENT} "${PJPROJECT_COMPONENT}-asteriskscf")
endif()
- elseif(MSVC80 OR MSVC90)
+ elseif(MSVC80 OR MSVC90 OR MSVC10)
if(${PJPROJECT_COMPONENT} STREQUAL "pjsip")
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
target_link_libraries(${COMPONENT} debug "pjsip-core-i386-Win32-vc8-Debug")
commit a25745891bf9113a35b2081966fb3efdb7d68fff
Author: Joshua Colp <jcolp at digium.com>
Date: Fri Jan 7 09:09:48 2011 -0400
Add support for MSVC++ 2010 to the pjproject module so it will pull in pjproject solution files.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 2dbd66d..c6bcf87 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -49,7 +49,7 @@ function(pjproject_build PJPROJECT_COMPONENT)
elseif(${PJPROJECT_COMPONENT} STREQUAL "pjnath")
add_dependencies("pjproject-pjnath", "pjproject-pjlib-util")
endif()
- elseif(MSVC80 OR MSVC90)
+ elseif(MSVC80 OR MSVC90 OR MSVC10)
if(${PJPROJECT_COMPONENT} STREQUAL "pjlib-util")
include_external_msproject(pjlib_util "${CMAKE_SOURCE_DIR}/pjproject/pjlib-util/build/pjlib_util.vcproj")
elseif(${PJPROJECT_COMPONENT} STREQUAL "pjsip")
-----------------------------------------------------------------------
--
asterisk-scf/integration/cmake.git
More information about the asterisk-scf-commits
mailing list