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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  85da38bbc7a2e0c5a876f77a2c031d49bc14e3d5 (commit)
       via  8e5b72735bbc0021506f11c678ac71e3e39f5578 (commit)
      from  7d4807073f611a1481850f8d9389b4ab1e5badcd (commit)

Summary of changes:
 CMakeLists.txt |    2 ++
 cmake          |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 85da38bbc7a2e0c5a876f77a2c031d49bc14e3d5
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 7 17:23:45 2010 -0500

    Updating to latest cmake scripts.

diff --git a/cmake b/cmake
index e348824..17066de 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e3488247f81dfae2695e778565a7c43182836313
+Subproject commit 17066de364794f3befcdcca030ca31d349e83eea

commit 8e5b72735bbc0021506f11c678ac71e3e39f5578
Author: David M. Lee <dlee at digium.com>
Date:   Thu Oct 7 17:22:16 2010 -0500

    Set a service_locator_bindir to make the libs findable.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 252c0d5..1f2d329 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,8 @@ if(NOT integrated_build STREQUAL "true")
    # logger is integrated into our build
    set(integrated_build true)
    add_subdirectory(logger)
+else()
+  set(service_locator_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 endif()
 
 # Include the subdirectory information. This is separate so that

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


-- 
asterisk-scf/integration/servicediscovery.git