[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jan 10 11:53:08 CST 2012
branch "master" has been updated
via 6e60fd6ef9df278bbb459187ddf17d5fe557fb62 (commit)
via 77e05f51eb35f8e0a8c567b950ba3f87966a9b14 (commit)
via c99df8440693ec556829afe1c439354520dc4cb9 (commit)
via 38b89e6de2bc7749711b54457b8d9eb998d89ff3 (commit)
via 62525b614667c88512994722331c4431d2df0ffd (commit)
via d0367dee5975298865320ef4c34eb11526e516e9 (commit)
via 0a303ccb33b2d5d4667b6ac62829ab397b40dc8f (commit)
from 5598a772d193bf6dee2d5cb80d96536062c2b278 (commit)
Summary of changes:
cmake/AsteriskSCF.cmake | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
- Log -----------------------------------------------------------------
commit 6e60fd6ef9df278bbb459187ddf17d5fe557fb62
Merge: 5598a77 77e05f5
Author: David M. Lee <dlee at digium.com>
Date: Tue Jan 10 11:47:34 2012 -0600
Merge branch 'cmake-master'
Some files were changed in the cmake/ subdirectory of gitall, which is a
Bad Thing(TM), since those files come in via a subtree merge. This
commit merges the changes to hopefully get change tracking synchronized
between the two.
This will introduce duplicate changes in history, where a change in
gitall was cherry-picked into cmake and merged back. But that's the
most sane way to get things back in working order.
Conflicts:
cmake/AsteriskSCF.cmake
commit 77e05f51eb35f8e0a8c567b950ba3f87966a9b14
Author: Brent Eagles <beagles at digium.com>
Date: Fri Sep 16 16:04:13 2011 -0230
Fix error in adding resampling library dependency.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 66e4f22..b72bec4 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -124,7 +124,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
target_link_libraries(${COMPONENT} "pjsdp-asteriskscf")
target_link_libraries(${COMPONENT} "pjmedia-audiodev-asteriskscf")
target_link_libraries(${COMPONENT} "srtp-asteriskscf")
- target_link_libraries(${COMPONENT} "resample")
+ target_link_libraries(${COMPONENT} "resample-asteriskscf")
if(PJMEDIA_LIBRARIES)
target_link_libraries(${COMPONENT} ${PJMEDIA_LIBRARIES})
endif()
commit c99df8440693ec556829afe1c439354520dc4cb9
Author: Brent Eagles <beagles at digium.com>
Date: Fri Sep 16 13:24:53 2011 -0230
Add support for resampling library on Windows.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index 8dd11c4..66e4f22 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -90,7 +90,8 @@ function(pjproject_build PJPROJECT_COMPONENT)
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)
+ include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample_dll.${VCPROJ_EXT}")
+ add_dependencies(pjmedia pjmedia_audiodev srtp resample)
elseif(${PJPROJECT_COMPONENT} STREQUAL "third_party")
else()
include_external_msproject(${PJPROJECT_COMPONENT} "${CMAKE_SOURCE_DIR}/pjproject/${PJPROJECT_COMPONENT}/build/${PJPROJECT_COMPONENT}.${VCPROJ_EXT}")
@@ -123,6 +124,7 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
target_link_libraries(${COMPONENT} "pjsdp-asteriskscf")
target_link_libraries(${COMPONENT} "pjmedia-audiodev-asteriskscf")
target_link_libraries(${COMPONENT} "srtp-asteriskscf")
+ target_link_libraries(${COMPONENT} "resample")
if(PJMEDIA_LIBRARIES)
target_link_libraries(${COMPONENT} ${PJMEDIA_LIBRARIES})
endif()
@@ -165,6 +167,8 @@ function(pjproject_link COMPONENT PJPROJECT_COMPONENT)
target_link_libraries(${COMPONENT} optimized "pjmedia-audiodev-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
target_link_libraries(${COMPONENT} debug "libsrtp-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Debug")
target_link_libraries(${COMPONENT} optimized "libsrtp-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
+ target_link_libraries(${COMPONENT} debug "libresample-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Debug")
+ target_link_libraries(${COMPONENT} optimized "libresample-${X_CPU}-${X_TARG}-${MSVC_VERSION}-Release")
add_dependencies(${COMPONENT} pjmedia)
else()
if(${CMAKE_CL_64})
commit 38b89e6de2bc7749711b54457b8d9eb998d89ff3
Author: Brent Eagles <beagles at digium.com>
Date: Fri Nov 11 11:44:24 2011 -0330
- Put MSVC compiler conditional around /MP flag option.
- Reset cached strings for some key common component target related variables.
- Add MSVC specific tweak for disabling warnings on generated code. /W0 instead of -w
removes the warning that shows up everywhere when compiling on Windows.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 084a48c..d699e31 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -153,6 +153,11 @@ if(WIN32)
endif()
#
+ # To make boost happy.
+ #
+ add_definitions(-D_WIN32_WINNT=0x0501)
+
+ #
# On 64 bit builds on Windows (Windows x64), projects that include
# pjproject header files need to define the architecture to allow
# the appropriate definitions to be compiled in. Note that this may
@@ -170,7 +175,9 @@ if(WIN32)
# multiple cores at a time compile files. Combined with concurrent
# project builds, this can speed up builds on multi-core systems.
#
- add_definitions(/MP)
+ if(MSVC)
+ add_definitions(/MP)
+ endif()
endif()
if(UNIX)
@@ -448,6 +455,10 @@ endfunction()
function(astscf_component_init COMPONENT)
message(STATUS "Setting up to build component ${COMPONENT}")
__astscf_set_cache_string(ASTSCF_COMPONENT_${COMPONENT} Bob "" ADVANCED)
+ __astscf_set_cache_string(${COMPONENT}_SOURCES "" "" ADVANCED)
+ __astscf_set_cache_string(${COMPONENT}_BOOST_LIBRARIES "" "" ADVANCED)
+ __astscf_set_cache_string(${COMPONENT}_ICE_LIBRARIES "" "" ADVANCED)
+ __astscf_set_cache_string(${COMPONENT}_SLICE_LIBRARIES "" "" ADVANCED)
endfunction()
# Function which adds Boost libraries needed by a component
@@ -921,7 +932,11 @@ function(__astscf_component_add_one_slice COMPONENT COLLECTION COLLECTION_DIR SL
set(file_list ${${COMPONENT}_SOURCES} ${COLLECTION_DIR}/${SLICE} ${generated_files})
set(${COMPONENT}_SOURCES ${file_list} PARENT_SCOPE)
# disable warnings for generated files. rarely are these real bugs.
- set_source_files_properties(${file_list} PROPERTIES COMPILE_FLAGS "-w")
+ if(MSVC)
+ set_source_files_properties(${file_list} PROPERTIES COMPILE_FLAGS "/W0")
+ else()
+ set_source_files_properties(${file_list} PROPERTIES COMPILE_FLAGS "-w")
+ endif()
endfunction()
# Function which collects Slice files used by a component, causing them
commit 62525b614667c88512994722331c4431d2df0ffd
Author: Brent Eagles <beagles at digium.com>
Date: Tue Nov 8 14:24:12 2011 -0330
Add /MP flag to Windows projects
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index f0e16eb..084a48c 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -164,6 +164,13 @@ if(WIN32)
if(${CMAKE_CL_64})
add_definitions(-D__amd64)
endif()
+
+ #
+ # Add the /MP compiler flag to allow the C++ compiler to use
+ # multiple cores at a time compile files. Combined with concurrent
+ # project builds, this can speed up builds on multi-core systems.
+ #
+ add_definitions(/MP)
endif()
if(UNIX)
commit d0367dee5975298865320ef4c34eb11526e516e9
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Nov 7 12:01:19 2011 -0400
Allow the location of Icebox to be explicitly specified. (issue ASTSCF-321)
diff --git a/modules/FindIceBox.cmake b/modules/FindIceBox.cmake
index dc27d4f..d45fee0 100644
--- a/modules/FindIceBox.cmake
+++ b/modules/FindIceBox.cmake
@@ -68,8 +68,8 @@ function(_ice_find_program program)
list(APPEND _ice_progdirs "bin")
endif()
- find_program(ICE_${upper}_PROGRAM_RELEASE NAMES "${program}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_progdirs})
- find_program(ICE_${upper}_PROGRAM_DEBUG NAMES "${program}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_progdirs})
+ find_program(ICE_${upper}_PROGRAM_RELEASE NAMES "${program}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICEBOX_DIR}" PATH_SUFFIXES ${_ice_progdirs})
+ find_program(ICE_${upper}_PROGRAM_DEBUG NAMES "${program}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICEBOX_DIR}" PATH_SUFFIXES ${_ice_progdirs})
mark_as_advanced(ICE_${upper}_PROGRAM_RELEASE ICE_${upper}_PROGRAM_DEBUG)
commit 0a303ccb33b2d5d4667b6ac62829ab397b40dc8f
Author: Joshua Colp <jcolp at digium.com>
Date: Mon Nov 7 12:00:33 2011 -0400
Allow the location of the Ice libraries to be explicitly specified. (issue ASTSCF-320)
diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index a300d39..9d8f382 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -146,8 +146,8 @@ function(_ice_find_library library)
list(APPEND _ice_libdirs "lib")
endif()
- find_library(ICE_${upper}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_libdirs})
- find_library(ICE_${upper}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_libdirs})
+ find_library(ICE_${upper}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICE_LIBRARY_DIR}" PATH_SUFFIXES ${_ice_libdirs})
+ find_library(ICE_${upper}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICE_LIBRARY_DIR}" PATH_SUFFIXES ${_ice_libdirs})
mark_as_advanced(ICE_${upper}_LIBRARY_RELEASE ICE_${upper}_LIBRARY_DEBUG)
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list