[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
Wed Nov 9 13:15:46 CST 2011
branch "master" has been updated
via ae5ae765ff759b27c1f5254f645c860efa5ab94e (commit)
from 320828212f78bc581eeebdb765eb5b463ec86f54 (commit)
Summary of changes:
cmake/AsteriskSCF.cmake | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
- Log -----------------------------------------------------------------
commit ae5ae765ff759b27c1f5254f645c860efa5ab94e
Author: Brent Eagles <beagles at digium.com>
Date: Wed Nov 9 15:42:43 2011 -0330
Clear out source/lib cache entries for tracking files that are part of a target
when the target is initialized via ascf_component_init(). This prevents
constantly growing entries and the persistence of files that may have been
renamed/moved in the generated build system.
Also corrected a flaw on the generated Windows projects for generated code
compilation that produced numerous meaningingless warnings (/W3 has been
replaced by /w).
diff --git a/cmake/AsteriskSCF.cmake b/cmake/AsteriskSCF.cmake
index 1ebc708..f81450c 100644
--- a/cmake/AsteriskSCF.cmake
+++ b/cmake/AsteriskSCF.cmake
@@ -448,6 +448,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 +925,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(WIN32)
+ 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
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list