[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Apr 27 11:12:31 CDT 2011
branch "master" has been updated
via 0267addab4eaaae77d941de5263309b6f29582b2 (commit)
from 8d17d8dde8e1e7eed470d002fa32935bfa2d26a8 (commit)
Summary of changes:
AmiCollector/CMakeLists.txt | 7 ++-----
AmiCollector/test/CMakeLists.txt | 5 +----
CMakeLists.txt | 2 +-
SmartProxy/CMakeLists.txt | 27 ++++++---------------------
StateReplicator/CMakeLists.txt | 23 +++++------------------
StateReplicator/test/CMakeLists.txt | 7 ++-----
TestFixture/CMakeLists.txt | 11 +++--------
7 files changed, 20 insertions(+), 62 deletions(-)
- Log -----------------------------------------------------------------
commit 0267addab4eaaae77d941de5263309b6f29582b2
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/AmiCollector/CMakeLists.txt b/AmiCollector/CMakeLists.txt
index 8233f7f..79b910f 100644
--- a/AmiCollector/CMakeLists.txt
+++ b/AmiCollector/CMakeLists.txt
@@ -1,17 +1,14 @@
-asterisk_scf_component_init(ami-collector CXX)
-
include_directories(include)
+asterisk_scf_component_init(ami-collector)
asterisk_scf_component_add_file(ami-collector include/AsteriskSCF/AmiCollector.h)
asterisk_scf_component_add_file(ami-collector include/AsteriskSCF/ResponseCollector.h)
asterisk_scf_component_add_file(ami-collector src/AmiCollector.cpp)
-
asterisk_scf_component_add_boost_libraries(ami-collector thread)
-
asterisk_scf_component_build_library(ami-collector)
# don't install the component. it's just there to make Visual Studio happy
# _do_ install the header files
-asterisk_scf_headers_install(include/)
+asterisk_scf_headers_install(include)
add_subdirectory(test)
diff --git a/AmiCollector/test/CMakeLists.txt b/AmiCollector/test/CMakeLists.txt
index e095ba4..4079ce4 100644
--- a/AmiCollector/test/CMakeLists.txt
+++ b/AmiCollector/test/CMakeLists.txt
@@ -1,13 +1,10 @@
-asterisk_scf_component_init(ami-collector-test CXX)
include_directories("../src")
+asterisk_scf_component_init(ami-collector-test)
asterisk_scf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
asterisk_scf_component_add_file(ami-collector-test IceIntegration-test.cpp)
asterisk_scf_component_add_file(ami-collector-test TestAmiCollector.h)
asterisk_scf_component_add_file(ami-collector-test test.cpp)
-
asterisk_scf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
-
asterisk_scf_component_build_standalone(ami-collector-test)
-
asterisk_scf_test_boost(ami-collector-test)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d49205b..f5c23e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
asterisk_scf_project(ice-util-cpp 3.4)
if (integrated_build STREQUAL "true")
- set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+ set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
endif()
add_subdirectory(SmartProxy)
diff --git a/SmartProxy/CMakeLists.txt b/SmartProxy/CMakeLists.txt
index bdbe333..c137a64 100644
--- a/SmartProxy/CMakeLists.txt
+++ b/SmartProxy/CMakeLists.txt
@@ -1,32 +1,17 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# Smart Proxy build system
-
-asterisk_scf_component_init(SmartProxy CXX)
-
include_directories(include)
-
-asterisk_scf_component_add_file(SmartProxy include/AsteriskSCF/SmartProxy.h)
-asterisk_scf_component_add_file(SmartProxy src/SmartProxy.cpp)
-asterisk_scf_component_add_boost_libraries(SmartProxy core)
-
if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${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})
+asterisk_scf_component_init(SmartProxy)
+asterisk_scf_component_add_file(SmartProxy include/AsteriskSCF/SmartProxy.h)
+asterisk_scf_component_add_file(SmartProxy src/SmartProxy.cpp)
+asterisk_scf_component_add_boost_libraries(SmartProxy core)
asterisk_scf_component_build_library(SmartProxy)
-
-include_directories(${API_INCLUDE_DIR})
target_link_libraries(SmartProxy logging-client)
# don't install the component. it's just there to make Visual Studio happy
# _do_ install the header files
-asterisk_scf_headers_install(include/)
+asterisk_scf_headers_install(include)
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index 472c21c..69bc146 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -1,26 +1,13 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-# State Replicator build system
-
-asterisk_scf_component_init(StateReplicator CXX)
-
include_directories(include)
-asterisk_scf_component_add_file(StateReplicator
- include/AsteriskSCF/StateReplicator.h)
+asterisk_scf_component_init(StateReplicator)
+asterisk_scf_component_add_file(StateReplicator include/AsteriskSCF/StateReplicator.h)
asterisk_scf_component_add_file(StateReplicator src/StateReplicator.cpp)
asterisk_scf_component_add_boost_libraries(StateReplicator thread)
-
asterisk_scf_component_build_library(StateReplicator)
-add_subdirectory(test)
-
# don't install the component. it's just there to make Visual Studio happy
# _do_ install the header files
-asterisk_scf_headers_install(include/)
+asterisk_scf_headers_install(include)
+
+add_subdirectory(test)
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 43b0f1a..f3706cb 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -1,13 +1,10 @@
-# Create State Replicator Test project.
-
-asterisk_scf_component_init(StateReplicatorTest CXX)
include_directories("../include")
+
+asterisk_scf_component_init(StateReplicatorTest)
asterisk_scf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
asterisk_scf_component_add_file(StateReplicatorTest SharedTestData.h)
asterisk_scf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
asterisk_scf_component_add_slice(StateReplicatorTest ../testslice/StateReplicatorTestIf.ice)
asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
-
asterisk_scf_component_build_standalone(StateReplicatorTest)
-
asterisk_scf_test_boost(StateReplicatorTest)
diff --git a/TestFixture/CMakeLists.txt b/TestFixture/CMakeLists.txt
index 26d5897..bf09c89 100644
--- a/TestFixture/CMakeLists.txt
+++ b/TestFixture/CMakeLists.txt
@@ -1,16 +1,11 @@
-asterisk_scf_component_init(testfixture CXX)
-
include_directories(include)
+asterisk_scf_component_init(testfixture)
asterisk_scf_component_add_file(testfixture include/AsteriskSCF/IceBoxBoostTest.h)
asterisk_scf_component_add_file(testfixture src/TestFixture.cpp)
-
asterisk_scf_component_add_boost_libraries(testfixture unit_test_framework)
+asterisk_scf_component_build_icebox(testfixture)
# don't install the component. it's just there to make Visual Studio happy
# _do_ install the header files
-asterisk_scf_headers_install(include/)
-
-include_directories(include)
-
-asterisk_scf_component_build_icebox(testfixture)
+asterisk_scf_headers_install(include)
-----------------------------------------------------------------------
--
asterisk-scf/release/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list