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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  5867586fe8d25732fe8da1e546a64c2910cdce9d (commit)
      from  ce2465680b718044666afd548a39e91201d89ba2 (commit)

Summary of changes:
 CMakeLists.txt      |   26 --------------------------
 src/CMakeLists.txt  |   41 ++++++++---------------------------------
 test/CMakeLists.txt |   15 ++-------------
 3 files changed, 10 insertions(+), 72 deletions(-)


- Log -----------------------------------------------------------------
commit 5867586fe8d25732fe8da1e546a64c2910cdce9d
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 4561277..8166a0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,29 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Service locator build system
-
-if(NOT integrated_build STREQUAL "true")
-
-   # Minimum we require is 2.8, any lower and stuff would fail horribly
-   cmake_minimum_required(VERSION 2.8)
-
-   # Include common AsteriskSCF build infrastructure
-   include(cmake/AsteriskSCF.cmake)
-
-   # Take care of slice definitions
-   add_subdirectory(slice EXCLUDE_FROM_ALL)
-
-   # logger is integrated into our build
-   set(integrated_build true)
-   add_subdirectory(logger)
-endif()
-
 asterisk_scf_project(service_locator 3.4)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b72ddb2..b1ec31b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,24 +1,16 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-include_directories(${utils_dir}/StateReplicator/src)
-include_directories(${utils_dir}/SmartProxy/src)
-
+if(NOT logger_dir)
+  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${utils_dir}/AmiCollector/include)
+include_directories(${logger_dir}/include)
+include_directories(${API_INCLUDE_DIR})
 include_directories(${utils_dir}/StateReplicator/include)
 include_directories(${utils_dir}/SmartProxy/include)
 
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
-# Create the actual standalone service locator component
-asterisk_scf_component_init(service_locator CXX)
-
+asterisk_scf_component_init(service_locator)
 asterisk_scf_component_add_slice(service_locator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-
 asterisk_scf_component_add_file(service_locator ServiceLocator.cpp)
 asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.cpp)
 asterisk_scf_component_add_file(service_locator ServiceManagement.cpp)
@@ -28,36 +20,19 @@ asterisk_scf_component_add_file(service_locator ServiceManagement.h)
 asterisk_scf_component_add_file(service_locator ServiceLocatorManagement.h)
 asterisk_scf_component_add_file(service_locator ServiceLocatorStateReplicator.h)
 asterisk_scf_component_add_file(service_locator ServiceLocatorStateListener.cpp)
-
 asterisk_scf_component_add_ice_libraries(service_locator IceStorm)
 asterisk_scf_component_add_ice_libraries(service_locator IceBox)
-
 asterisk_scf_component_add_boost_libraries(service_locator core thread date_time)
-
-if(NOT logger_dir)
-   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${utils_dir}/AmiCollector/include)
-include_directories(${logger_dir}/include)
-include_directories(${API_INCLUDE_DIR})
-
 asterisk_scf_component_build_icebox(service_locator)
 target_link_libraries(service_locator logging-client)
-
 asterisk_scf_component_install(service_locator)
 
-asterisk_scf_component_init(ServiceLocatorStateReplicator CXX)
-
+asterisk_scf_component_init(ServiceLocatorStateReplicator)
 asterisk_scf_component_add_slice(ServiceLocatorStateReplicator ../local-slice/ServiceLocatorStateReplicationIf.ice)
-
 asterisk_scf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicatorApp.cpp)
 asterisk_scf_component_add_file(ServiceLocatorStateReplicator ServiceLocatorStateReplicator.h)
-
 asterisk_scf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
-
 asterisk_scf_component_add_boost_libraries(ServiceLocatorStateReplicator thread date_time)
-
 asterisk_scf_component_build_icebox(ServiceLocatorStateReplicator)
 target_link_libraries(ServiceLocatorStateReplicator logging-client)
-
 asterisk_scf_component_install(ServiceLocatorStateReplicator)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7c26a40..30cda7b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,23 +1,12 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
+include_directories(${API_INCLUDE_DIR})
 
-# Create the actual standalone service locator test driver component
 asterisk_scf_component_init(service_locator_test CXX)
 asterisk_scf_component_add_file(service_locator_test TestServiceLocator.cpp)
 asterisk_scf_component_add_file(service_locator_test TestComparatorBlocking.cpp)
 asterisk_scf_component_add_ice_libraries(service_locator_test IceStorm)
-asterisk_scf_component_add_boost_libraries(service_locator_test
-    unit_test_framework thread date_time)
-
-include_directories(${API_INCLUDE_DIR})
+asterisk_scf_component_add_boost_libraries(service_locator_test unit_test_framework thread date_time)
 asterisk_scf_component_build_icebox(service_locator_test)
 target_link_libraries(service_locator_test asterisk-scf-api)
-
 asterisk_scf_test_icebox(service_locator_test config/test_component.config)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/AsteriskSCFIceStorm)

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


-- 
asterisk-scf/release/servicediscovery.git