[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
Thu Mar 15 17:18:12 CDT 2012
branch "master" has been updated
via b991984a417b9c4702b3ab9fbfd8453b825e5ba8 (commit)
via 346da67a06b49d990804162dce91de2144d96e8b (commit)
via 9de9affbbadac633990c95a2496bd08aee534ba3 (commit)
via 57bbeebe490f4ac54f9040a9ec440e8194c8d25d (commit)
via 88e28bfed27fef6f4c3b94578437e05aa6e139f9 (commit)
via e1fa29a75eb39f7392eaf219f8110085e9e454d5 (commit)
via ce28292c0dbb4edcb8a44a9979ac547a0db6a817 (commit)
from a66cedb762fb1d0ebccf2d7e765e594c56f5b679 (commit)
Summary of changes:
cmake/AsteriskSCF.cmake | 23 +++++++++++++++++++++--
cmake/modules/FindIce.cmake | 1 +
2 files changed, 22 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit b991984a417b9c4702b3ab9fbfd8453b825e5ba8
Merge: a66cedb 346da67
Author: David M. Lee <dlee at digium.com>
Date: Thu Mar 15 14:21:22 2012 -0500
Merge remote-tracking branch 'cmake/master'
commit 346da67a06b49d990804162dce91de2144d96e8b
Author: David M. Lee <dlee at digium.com>
Date: Thu Mar 15 13:19:01 2012 -0500
Fix symbol resolution problems on OS X.
On OS X, if an object is passed between modules, it would have
unexpected RTTI, which would cause dynamic_cast to fail. Adding the
-flat_namespace flag allows dlopen's RTLD_GLOBAL flag to work properly.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 0958824..ea4fe3a 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -381,6 +381,15 @@ function(astscf_project NAME ICE_VERSION)
endif()
endif()
+ # OS X has a two level namespace, which resolves symbols differently than
+ # other OS's. To allow components to pass objects within the same IceBox,
+ # -flat_namespace must be set. See https://wiki.asterisk.org/wiki/x/HQsiAQ
+ # for details.
+ if(APPLE)
+ list(APPEND c_flags -flat_namespace)
+ list(APPEND cxx_flags -flat_namespace)
+ endif()
+
if(CMAKE_COMPILER_IS_GNUCC)
list(APPEND c_flags_debug "-Wall" "-g3")
list(APPEND c_flags_profile "-ftest-coverage" "-fprofile-arcs")
commit 9de9affbbadac633990c95a2496bd08aee534ba3
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 20 16:43:17 2011 -0500
Fix for OS X.
Apple's version of GCC doesn't support --no-undefined. Unfortunately,
there's not a straightforward way to test for the flag, so if (NOT
APPLE) it is.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index a2e2b8a..0958824 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -395,8 +395,10 @@ function(astscf_project NAME ICE_VERSION)
# into the object have been satisfied... which means that unresolved
# symbols won't be found until runtime. This flag tells the linker
# to do that resolution at link time, and report an error if a symbol
- # is unresolved.
- list(APPEND cxx_flags_debug "-Wl,--no-undefined")
+ # is unresolved. This flag not supported by the OS X linker.
+ if(NOT APPLE)
+ list(APPEND cxx_flags_debug "-Wl,--no-undefined")
+ endif()
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG(-Wlogical-op HAVE_W_LOGICAL_OP)
if(HAVE_W_LOGICAL_OP)
commit 57bbeebe490f4ac54f9040a9ec440e8194c8d25d
Author: Brent Eagles <beagles at digium.com>
Date: Thu Feb 16 15:39:30 2012 -0330
The list of paths to search for x64 builds was incomplete.
diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index 9d8f382..8bdc3ec 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -138,6 +138,7 @@ function(_ice_find_library library)
endif()
if(CMAKE_CL_64)
set(_ice_libdir "${_ice_libdir}/x64")
+ list(APPEND _ice_libdirs "lib/x64")
endif()
# first search the more specified libdir, as used by the .msi installer
# if it's not there, try just lib. that's where make install puts it
commit 88e28bfed27fef6f4c3b94578437e05aa6e139f9
Author: Brent Eagles <beagles at digium.com>
Date: Thu Feb 16 15:30:40 2012 -0330
Search for slice2cpp in 64 bit subdirectory for some types of ice installs.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 2d046ba..a2e2b8a 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -695,6 +695,14 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
message(FATAL_ERROR "Slice collection ${COLLECTION} has not been defined.")
endif()
+ set(_x64dir "")
+ if(${CMAKE_CL_64})
+ set(_x64dir "${ICE_DIR}/bin/x64")
+ endif()
+
+ find_program(SLICE_COMPILER slice2cpp PATHS "${ICE_DIR}/bin" "${_x64dir}"
+ NO_DEFAULT_PATH)
+
if(NOT SLICE_COMPILER)
# Find the actual Slice compiler
find_program(SLICE_COMPILER slice2cpp PATHS "${ICE_DIR}/bin"
commit e1fa29a75eb39f7392eaf219f8110085e9e454d5
Author: Brent Eagles <beagles at digium.com>
Date: Wed Feb 8 13:11:19 2012 -0330
Change name of library for pjproject's resample lib.
diff --git a/modules/pjproject.cmake b/modules/pjproject.cmake
index b72bec4..4fdcdef 100644
--- a/modules/pjproject.cmake
+++ b/modules/pjproject.cmake
@@ -90,7 +90,7 @@ 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}")
- include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample_dll.${VCPROJ_EXT}")
+ include_external_msproject(resample "${CMAKE_SOURCE_DIR}/pjproject/third_party/build/resample/libresample.${VCPROJ_EXT}")
add_dependencies(pjmedia pjmedia_audiodev srtp resample)
elseif(${PJPROJECT_COMPONENT} STREQUAL "third_party")
else()
commit ce28292c0dbb4edcb8a44a9979ac547a0db6a817
Author: Brent Eagles <beagles at digium.com>
Date: Tue Feb 7 16:49:56 2012 -0330
Allowing test timeouts to be overridden in the target's CMakeLists.txt file.
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index d699e31..2d046ba 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -1117,6 +1117,9 @@ function(astscf_test_boost NAME)
set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
file(MAKE_DIRECTORY "${project_test_results}")
file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+ if(LOCAL_TIMEOUT_OVERRIDE)
+ set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+ endif()
__astscf_set_test_props("${NAME}" "${project_test_results}")
endfunction()
@@ -1126,5 +1129,8 @@ function(astscf_test_icebox NAME CONFIG)
set(project_test_results "${CMAKE_BINARY_DIR}/test_results/${ASTSCF_PROJECT}")
file(MAKE_DIRECTORY "${project_test_results}")
file(TO_NATIVE_PATH "${project_test_results}-${NAME}.xml" project_test_results)
+ if(LOCAL_TIMEOUT_OVERRIDE)
+ set(TEST_TIMEOUT_SEC "${LOCAL_TIMEOUT_OVERRIDE}")
+ endif()
__astscf_set_test_props("${NAME}" "${project_test_results}")
endfunction()
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list