[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  38b89e6de2bc7749711b54457b8d9eb998d89ff3 (commit)
      from  62525b614667c88512994722331c4431d2df0ffd (commit)

Summary of changes:
 AsteriskSCF.cmake |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
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

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


-- 
asterisk-scf/release/cmake.git