[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  531f5fd38f97fbc3220f902a979bf172db50fdd2 (commit)
      from  ccc9fef2f724df94c7b313a815eda7dcb43ddcda (commit)

Summary of changes:
 CMakeLists.txt |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit 531f5fd38f97fbc3220f902a979bf172db50fdd2
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Apr 27 11:10:48 2011 -0500

    CMakeLists.txt cleanup across the entire tree.
    
    * Consistent formatting.
    * Removed old non-integrated build stuff.
    * Organized include_directories() calls since they affect every component in
      the directory they are executed in.
    * Keep all scripts lines for each component together.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d97fc1..b0d2cb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,27 +1,17 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
 asterisk_scf_project(API 3.4)
 
-asterisk_scf_component_init(asterisk-scf-api CXX)
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
+set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
 
 # Make all of our slice definitions available to... themselves!
 asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-asterisk_scf_component_add_slice(asterisk-scf-api
-    GLOB_RECURSE "AsteriskSCF/*.ice")
-
 asterisk_scf_add_ice_libraries(Ice IceUtil)
-asterisk_scf_component_build_library(asterisk-scf-api)
-
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
-set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
 
+asterisk_scf_component_init(asterisk-scf-api)
+asterisk_scf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
+asterisk_scf_component_build_library(asterisk-scf-api)
 asterisk_scf_component_install(asterisk-scf-api)
+
 asterisk_scf_slice_headers_install()
 asterisk_scf_slice_install(AsteriskSCF)

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


-- 
asterisk-scf/release/slice.git