[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  f1ba89aa404fe8e47887d8d9af2692187b9b9c44 (commit)
       via  da775eff48a280c9c4a4ffc909f348e8b6fedf17 (commit)
      from  0b44631d5135fe1ff99346ec991fd722b9785701 (commit)

Summary of changes:
 CMakeLists.txt                 |    7 +------
 src/CMakeLists.txt             |   10 +---------
 src/ThreadPool/CMakeLists.txt  |    9 +--------
 src/WorkQueue/CMakeLists.txt   |    8 --------
 test/ThreadPool/CMakeLists.txt |   10 ----------
 test/WorkQueue/CMakeLists.txt  |   13 +------------
 6 files changed, 4 insertions(+), 53 deletions(-)


- Log -----------------------------------------------------------------
commit f1ba89aa404fe8e47887d8d9af2692187b9b9c44
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 1 17:04:46 2011 -0500

    We need to install the ice-util-cpp library.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee4c94e..c6cc0d8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,5 +34,5 @@ asterisk_scf_component_add_boost_libraries(ice-util-cpp core thread date_time)
 asterisk_scf_component_build_library(ice-util-cpp)
 target_link_libraries(ice-util-cpp logging-client)
 target_link_libraries(ice-util-cpp asterisk-scf-api)
+asterisk_scf_component_install(ice-util-cpp)
 
-# don't install the component.  it's just there to make Visual Studio happy

commit da775eff48a280c9c4a4ffc909f348e8b6fedf17
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jun 1 16:57:22 2011 -0500

    More CMake script cleanup.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74b1a43..3690011 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,9 @@
 asterisk_scf_project(ice-util-cpp 3.4)
 
-if (integrated_build STREQUAL "true")
-  set(utils_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-endif()
+set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
 
 include_directories(include)
 include_directories(${API_INCLUDE_DIR})
-if(NOT logger_dir)
-   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
-endif()
 include_directories(${logger_dir}/include)
 asterisk_scf_slice_include_directories(${API_SLICE_DIR})
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61a4ebf..ee4c94e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
 # Ice Utilities for C++
 
 asterisk_scf_component_init(ice-util-cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index 28fd27f..f20e468 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,11 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
 asterisk_scf_component_init(ThreadPool)
 asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
 asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
@@ -15,3 +7,4 @@ asterisk_scf_component_add_boost_libraries(ThreadPool thread date_time)
 asterisk_scf_component_build_library(ThreadPool)
 target_link_libraries(ThreadPool WorkQueue)
 target_link_libraries(ThreadPool asterisk-scf-api)
+asterisk_scf_component_install(ThreadPool)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index d642f69..6ca491d 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,11 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
 asterisk_scf_component_init(WorkQueue)
 asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
 asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index f7a2c70..ec1a786 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -1,13 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-include_directories(../../src/ThreadPool)
-
 asterisk_scf_component_init(ThreadPoolTest)
 asterisk_scf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
 asterisk_scf_component_add_file(ThreadPoolTest test.cpp)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 8747c05..c0006f4 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -1,13 +1,3 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2011 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-include_directories(../../src/WorkQueue)
-
 asterisk_scf_component_init(WorkQueueTest)
 asterisk_scf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
 asterisk_scf_component_add_file(WorkQueueTest test.cpp)
@@ -15,6 +5,7 @@ asterisk_scf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
 asterisk_scf_component_build_standalone(WorkQueueTest)
 target_link_libraries(WorkQueueTest asterisk-scf-api)
 target_link_libraries(WorkQueueTest ice-util-cpp)
+asterisk_scf_test_boost(WorkQueueTest)
 
 asterisk_scf_component_init(SuspendableWorkQueueTest)
 asterisk_scf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
@@ -23,6 +14,4 @@ asterisk_scf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_fr
 asterisk_scf_component_build_standalone(SuspendableWorkQueueTest)
 target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
 target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
-
-asterisk_scf_test_boost(WorkQueueTest)
 asterisk_scf_test_boost(SuspendableWorkQueueTest)

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


-- 
asterisk-scf/release/ice-util-cpp.git