[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "logging" updated.

[Commits to the Asterisk SCF project code repositories]

branch "logging" has been updated
       via  366c80a7f14f368459ffd3d98e140eba6ea76087 (commit)
      from  482bfdde0634f68608a33f86f185878f7012defd (commit)

Summary of changes:
 .gitmodules        |    3 +++
 CMakeLists.txt     |    3 +++
 logger             |    1 +
 slice              |    2 +-
 src/CMakeLists.txt |    7 +++++--
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 160000 logger


- Log -----------------------------------------------------------------
commit 366c80a7f14f368459ffd3d98e140eba6ea76087
Author: David M. Lee <dlee at digium.com>
Date:   Tue Oct 5 11:45:27 2010 -0500

    Integrate logger into the standalone build.

diff --git a/.gitmodules b/.gitmodules
index 841f83c..a628faf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "slice"]
 	path = slice
 	url = ../../integration/slice
+[submodule "logger"]
+	path = logger
+	url = git at git.asterisk.org:asterisk-scf/integration/logger
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53c3c43..252c0d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,9 @@ if(NOT integrated_build STREQUAL "true")
    # 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()
 
 # Include the subdirectory information. This is separate so that
diff --git a/logger b/logger
new file mode 160000
index 0000000..0cc0c02
--- /dev/null
+++ b/logger
@@ -0,0 +1 @@
+Subproject commit 0cc0c02a16e404b94d54c8cb6736dee14a671352
diff --git a/slice b/slice
index 36a57a4..0c62939 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 36a57a423c849ff5688d8c4f3569bf3639feed36
+Subproject commit 0c629393e2f05dc0ed43bcc6305880949df36289
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92c53b1..44f0558 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,8 +25,11 @@ hydra_component_add_ice_libraries(service_locator IceBox)
 
 hydra_component_add_boost_libraries(service_locator core thread)
 
-include_directories(../../logger/common)
-include_directories(../../logger/client/src)
+if(NOT logger_dir)
+   message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
+endif()
+include_directories(${logger_dir}/common)
+include_directories(${logger_dir}/client/src)
 
 hydra_component_build_icebox(service_locator)
 target_link_libraries(service_locator logging-client)

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


-- 
asterisk-scf/integration/servicediscovery.git