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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  ba4ae430a0457506f51fad79931af15a0f921832 (commit)
      from  045fd22a8b91019e297fde1861d51414bbc0dd5b (commit)

Summary of changes:
 CMakeLists.txt      |   27 ---------------------------
 src/CMakeLists.txt  |   21 ++++++++-------------
 test/CMakeLists.txt |    8 +++-----
 3 files changed, 11 insertions(+), 45 deletions(-)


- Log -----------------------------------------------------------------
commit ba4ae430a0457506f51fad79931af15a0f921832
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 8dedc49..5fc6950 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,30 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Routing Service build system
-
-if(NOT integrated_build STREQUAL "true")
-
-   # Minimum we require is 2.8
-   cmake_minimum_required(VERSION 2.8)
-
-   # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled.
-   include(cmake/AsteriskSCF.cmake)
-
-   # Take care of slice definitions
-   add_subdirectory(slice)
-
-   # logger is integrated into our build
-   set(integrated_build true)
-   add_subdirectory(logger)
-   set(integrated_build false)
-endif()
-
 asterisk_scf_project(RoutingService 3.4)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b6e213..7b25cb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,13 @@
-# Create the actual standalone basic routing component
-asterisk_scf_component_init(BasicRoutingService CXX)
+if(NOT logger_dir)
+  message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/include)
+include_directories(${API_INCLUDE_DIR})
+include_directories(${utils_dir}/SmartProxy/include)
 find_package(Lua51 REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
+
+asterisk_scf_component_init(BasicRoutingService)
 asterisk_scf_component_add_file(BasicRoutingService BasicRoutingServiceApp.cpp)
 asterisk_scf_component_add_file(BasicRoutingService SessionRouter.cpp)
 asterisk_scf_component_add_file(BasicRoutingService SessionRouter.h)
@@ -14,21 +20,10 @@ asterisk_scf_component_add_file(BasicRoutingService LuaScriptProcessor.cpp)
 asterisk_scf_component_add_file(BasicRoutingService LuaScriptProcessor.h)
 asterisk_scf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.cpp)
 asterisk_scf_component_add_file(BasicRoutingService RoutingServiceEventPublisher.h)
-
 asterisk_scf_component_add_ice_libraries(BasicRoutingService IceStorm)
 asterisk_scf_component_add_boost_libraries(BasicRoutingService thread date_time core regex)
-
-if(NOT logger_dir)
-   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
-include_directories(${logger_dir}/include)
-include_directories(${API_INCLUDE_DIR})
-
-include_directories(${utils_dir}/SmartProxy/include)
-
 asterisk_scf_component_build_icebox(BasicRoutingService)
 target_link_libraries(BasicRoutingService ${LUA_LIBRARIES})
 target_link_libraries(BasicRoutingService logging-client)
 target_link_libraries(BasicRoutingService asterisk-scf-api)
-
 asterisk_scf_component_install(BasicRoutingService)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e51d804..ad19dcd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Create Basic Routing Service test project.
-asterisk_scf_component_init(RoutingTest CXX)
+include_directories(${API_INCLUDE_DIR})
 
+asterisk_scf_component_init(RoutingTest)
 asterisk_scf_component_add_file(RoutingTest TestRouting.cpp)
 asterisk_scf_component_add_file(RoutingTest SharedTestData.h)
 asterisk_scf_component_add_file(RoutingTest MockBridgeManager.h)
@@ -13,13 +13,11 @@ asterisk_scf_component_add_file(RoutingTest MockSessionEndpoint.h)
 asterisk_scf_component_add_file(RoutingTest MockSessionEndpoint.cpp)
 asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.h)
 asterisk_scf_component_add_file(RoutingTest MockEndpointLocator.cpp)
-
 asterisk_scf_component_add_ice_libraries(RoutingTest IceStorm)
 asterisk_scf_component_add_boost_libraries(RoutingTest unit_test_framework)
-include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_icebox(RoutingTest)
 target_link_libraries(RoutingTest asterisk-scf-api)
 
 if(integrated_build STREQUAL "true")
-   asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
+  asterisk_scf_test_icebox(RoutingTest config/routingtest-integ.config)
 endif()

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


-- 
asterisk-scf/release/routing.git