[asterisk-scf-commits] asterisk-scf/release/logger.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Apr 27 11:12:30 CDT 2011
branch "master" has been updated
via 5f5cd35c9c79d6b8df09b9507ab0f42e4a587c9c (commit)
from e69370e381c2150f3232f56febc064955168a202 (commit)
Summary of changes:
CMakeLists.txt | 38 ++++++--------------------------------
client/CMakeLists.txt | 8 --------
client/test/CMakeLists.txt | 20 +++-----------------
server/CMakeLists.txt | 8 --------
server/src/CMakeLists.txt | 24 +++++-------------------
server/test/CMakeLists.txt | 27 ++++++---------------------
6 files changed, 20 insertions(+), 105 deletions(-)
- Log -----------------------------------------------------------------
commit 5f5cd35c9c79d6b8df09b9507ab0f42e4a587c9c
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 5188668..f77429c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,40 +1,15 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Logging 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)
-else()
- set(logger_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-endif()
-
asterisk_scf_project(Logger 3.4)
add_subdirectory(server)
add_subdirectory(client) # For the client test directory.
-
# The client component is built here, so as to be able to add files
# from both src and include directories.
-asterisk_scf_component_init(logging-client CXX)
-
include_directories(include)
+include_directories(${API_INCLUDE_DIR})
+asterisk_scf_component_init(logging-client)
asterisk_scf_component_add_file(logging-client client/src/Logger.cpp)
asterisk_scf_component_add_file(logging-client client/src/LoggerFactory.cpp)
asterisk_scf_component_add_file(logging-client client/src/LogOut.cpp)
@@ -46,13 +21,12 @@ asterisk_scf_component_add_file(logging-client include/AsteriskSCF/logger.h)
asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/LogOut.h)
asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/IceLogger.h)
asterisk_scf_component_add_file(logging-client include/AsteriskSCF/Logger/Level.h)
-
asterisk_scf_component_add_boost_libraries(logging-client thread date_time)
asterisk_scf_add_ice_libraries(IceStorm)
-
-include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_build_library(logging-client)
target_link_libraries(logging-client asterisk-scf-api)
-
asterisk_scf_component_install(logging-client)
-install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
+
+asterisk_scf_headers_install(include)
+
+set(logger_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b38354d..552439e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,9 +1 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
add_subdirectory(test)
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index b7ede84..400625a 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -1,36 +1,22 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-asterisk_scf_component_init(logging-client-test CXX)
-
include_directories(../src)
include_directories(../../include)
+include_directories(${API_INCLUDE_DIR})
+asterisk_scf_component_init(logging-client-test)
asterisk_scf_component_add_file(logging-client-test Logger-test.cpp)
asterisk_scf_component_add_file(logging-client-test LoggerFactory-test.cpp)
asterisk_scf_component_add_file(logging-client-test LogBuf-test.cpp)
asterisk_scf_component_add_file(logging-client-test IceConfigurator-test.cpp)
asterisk_scf_component_add_file(logging-client-test client-test.cpp)
-
asterisk_scf_component_add_boost_libraries(logging-client-test unit_test_framework)
-
-include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_build_standalone(logging-client-test)
target_link_libraries(logging-client-test logging-client)
target_link_libraries(logging-client-test asterisk-scf-api)
asterisk_scf_test_boost(logging-client-test)
-asterisk_scf_component_init(scf-log CXX)
-
+asterisk_scf_component_init(scf-log)
asterisk_scf_component_add_file(scf-log scf-log.cpp)
-
asterisk_scf_component_add_boost_libraries(scf-log program_options)
-
asterisk_scf_component_build_standalone(scf-log)
target_link_libraries(scf-log logging-client)
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 6b2ef65..47f2510 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,10 +1,2 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
add_subdirectory(src)
add_subdirectory(test)
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index a2859bb..a77849d 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -1,46 +1,33 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
+include_directories(../../include)
+include_directories(${API_INCLUDE_DIR})
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(logging-service-lib CXX)
+asterisk_scf_add_ice_libraries(IceStorm)
+asterisk_scf_component_init(logging-service-lib CXX)
# an icebox module cannot be used as a shared lib. so build the bulk of the
# code as a static lib that can be linked into both the icebox module and
# the unit tests
asterisk_scf_set_libtype(logging-service-lib STATIC)
-
-include_directories(../../include)
-
asterisk_scf_component_add_file(logging-service-lib ChainedLogOut.cpp)
asterisk_scf_component_add_file(logging-service-lib FileChainedLogOut.cpp)
asterisk_scf_component_add_file(logging-service-lib LoggingServer.cpp)
asterisk_scf_component_add_file(logging-service-lib OstreamChainedLogOut.cpp)
asterisk_scf_component_add_file(logging-service-lib Configuration.cpp)
-
asterisk_scf_component_add_file(logging-service-lib ChainedLogOut.h)
asterisk_scf_component_add_file(logging-service-lib FileChainedLogOut.h)
asterisk_scf_component_add_file(logging-service-lib OstreamChainedLogOut.h)
asterisk_scf_component_add_file(logging-service-lib LoggingServer.h)
asterisk_scf_component_add_file(logging-service-lib Configuration.h)
-
asterisk_scf_component_add_slice(logging-service-lib ../local-slice/LoggingConfigurationIf.ice)
-
-asterisk_scf_add_ice_libraries(IceStorm)
asterisk_scf_component_add_boost_libraries(logging-service-lib core)
-
-include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_build_library(logging-service-lib)
target_link_libraries(logging-service-lib asterisk-scf-api)
# This lib is compiled into a .so, so it needs -fPIC set
if(CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties(logging-service-lib PROPERTIES COMPILE_FLAGS -fPIC)
+ set_target_properties(logging-service-lib PROPERTIES COMPILE_FLAGS -fPIC)
endif()
# icebox module
@@ -48,5 +35,4 @@ asterisk_scf_component_init(logging-service CXX)
asterisk_scf_component_add_file(logging-service main.cpp)
asterisk_scf_component_build_icebox(logging-service)
target_link_libraries(logging-service logging-service-lib)
-
asterisk_scf_component_install(logging-service)
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index e22d564..b70278a 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -1,42 +1,27 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-
-asterisk_scf_component_init(logging-service-test CXX)
-
include_directories(../src)
include_directories(../../include)
+include_directories(${API_INCLUDE_DIR})
+
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+asterisk_scf_component_init(logging-service-test)
asterisk_scf_component_add_file(logging-service-test LoggingServer-test.cpp)
asterisk_scf_component_add_file(logging-service-test server-test.cpp)
-
asterisk_scf_component_add_boost_libraries(logging-service-test unit_test_framework)
-
-include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_build_standalone(logging-service-test)
target_link_libraries(logging-service-test asterisk-scf-api)
-
target_link_libraries(logging-service-test logging-service-lib)
-
asterisk_scf_test_boost(logging-service-test)
-asterisk_scf_component_init(LoggingConfigurationTest CXX)
-
+asterisk_scf_component_init(LoggingConfigurationTest)
asterisk_scf_component_add_file(LoggingConfigurationTest ConfigurationTest.cpp)
asterisk_scf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.cpp)
asterisk_scf_component_add_file(LoggingConfigurationTest LoggingConfigurationHelper.h)
asterisk_scf_component_add_slice(LoggingConfigurationTest ../local-slice/LoggingConfigurationIf.ice)
asterisk_scf_component_add_boost_libraries(LoggingConfigurationTest unit_test_framework)
-include_directories(${API_INCLUDE_DIR})
asterisk_scf_component_build_icebox(LoggingConfigurationTest)
target_link_libraries(LoggingConfigurationTest asterisk-scf-api)
if(integrated_build STREQUAL "true")
- asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
+ asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
endif()
-----------------------------------------------------------------------
--
asterisk-scf/release/logger.git
More information about the asterisk-scf-commits
mailing list