[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  888bab69a54d2ba61120a07a9ac2b0f93e67fa1c (commit)
       via  7e84100cd48503054ec6a1654c8d089107add0ae (commit)
      from  1fa680321d5fa626a2033b15a6421ed8e6ca26c8 (commit)

Summary of changes:
 cmake/AsteriskSCF.cmake |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 888bab69a54d2ba61120a07a9ac2b0f93e67fa1c
Merge: 1fa6803 7e84100
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 24 16:03:33 2011 -0500

    Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/cmake


commit 7e84100cd48503054ec6a1654c8d089107add0ae
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Jun 24 16:02:04 2011 -0500

    Use consistent name for the 'flag' variable for components.
    
    astscf_component_init() sets a variable to indicate that a component has
    been initialized; in astscf_slice_collection_install(), this is checked to
    see if the library part of the collection is known component. Unfortunately
    the two functions did not use the same way of constructing the flag variable's
    name, and one of them was better... so now it is consistent throughout the
    script.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 0811c79..64a5ccb 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -431,7 +431,7 @@ endfunction()
 # Function which initializes a component for building
 function(astscf_component_init COMPONENT)
   message(STATUS "Setting up to build component ${COMPONENT}")
-  __astscf_set_cache_string(ASTSCF_${COMPONENT} Bob "" ADVANCED)
+  __astscf_set_cache_string(ASTSCF_COMPONENT_${COMPONENT} Bob "" ADVANCED)
 endfunction()
 
 # Function which adds Boost libraries needed by a component
@@ -439,7 +439,7 @@ function(astscf_component_add_boost_libraries COMPONENT)
   if(NOT ARGN)
     message(FATAL_ERROR "You must pass at least one library to this function")
   endif()
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   set(libs ${${COMPONENT}_BOOST_LIBRARIES})
@@ -462,7 +462,7 @@ function(astscf_component_add_files COMPONENT)
   if(NOT ARGN)
     message(FATAL_ERROR "You must pass at least one source file to this function")
   endif()
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   message(STATUS "Adding ${ARGN} to component ${COMPONENT}")
@@ -477,7 +477,7 @@ function(astscf_component_add_ice_libraries COMPONENT)
   if(NOT ARGN)
     message(FATAL_ERROR "You must pass at least one library to this function")
   endif()
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   set(libs ${${COMPONENT}_ICE_LIBRARIES})
@@ -620,7 +620,7 @@ function(astscf_component_add_slice_collection_libraries COMPONENT)
   if(NOT ARGN)
     message(FATAL_ERROR "You must pass at least one Slice collection to this function")
   endif()
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   set(libs ${${COMPONENT}_SLICE_LIBRARIES})
@@ -661,7 +661,7 @@ function(astscf_component_add_slices COMPONENT COLLECTION)
   if(NOT ARGN)
     message(FATAL_ERROR "You must pass at least one Slice file to this function")
   endif()
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   if(NOT SLICE_COLLECTION_${COLLECTION})
@@ -941,7 +941,7 @@ endfunction()
 
 # Function which builds a component as an IceBox service
 function(astscf_component_build_icebox COMPONENT)
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   message(STATUS "Building component ${COMPONENT} as an IceBox service")
@@ -959,7 +959,7 @@ endfunction()
 
 # Function which builds a component standalone
 function(astscf_component_build_standalone COMPONENT)
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   message(STATUS "Building component ${COMPONENT} as a standalone executable")
@@ -975,7 +975,7 @@ endfunction()
 
 function(astscf_component_build_library COMPONENT)
   cmake_parse_arguments("" "SHARED;STATIC;MODULE" "" "" ${ARGN})
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   if(NOT (_SHARED OR _STATIC OR _MODULE))
@@ -1002,7 +1002,7 @@ endfunction()
 
 # Install the given component to their proper location
 function(astscf_component_install COMPONENT)
-  if(NOT ASTSCF_${COMPONENT})
+  if(NOT ASTSCF_COMPONENT_${COMPONENT})
     message(FATAL_ERROR "Component ${COMPONENT} has not been initialized.")
   endif()
   if(${COMPONENT}_TYPE STREQUAL "icebox")

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


-- 
asterisk-scf/integration/gitall.git