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

[Commits to the Asterisk SCF project code repositories]

branch "install" has been updated
       via  d297f51ae46576f6a1e9c49f2cfbb3e77e8deccf (commit)
       via  fae843717eccc40785b9a70226487f68754007dd (commit)
       via  445bf6f66805ad4ba1ec0cf1983fa96931c56356 (commit)
      from  31d1895f86487f7e4ed59f26a0dd434c13864c02 (commit)

Summary of changes:
 CMakeLists.txt     |    6 ++----
 CMakeSubDirs.txt   |    7 -------
 src/CMakeLists.txt |    5 ++++-
 3 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 CMakeSubDirs.txt


- Log -----------------------------------------------------------------
commit d297f51ae46576f6a1e9c49f2cfbb3e77e8deccf
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 20:26:26 2011 -0600

    Properly install the service discovery components.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 260911f..1e310b0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,4 +30,7 @@ include_directories(${API_INCLUDE_DIR})
 
 asterisk_scf_component_build_icebox(service_locator)
 target_link_libraries(service_locator logging-client)
-#asterisk_scf_component_install(service_locator RUNTIME bin "Service Locator." Core)
+
+install(TARGETS service_locator
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})

commit fae843717eccc40785b9a70226487f68754007dd
Merge: 31d1895 445bf6f
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:27:49 2011 -0600

    Merge branch 'master' into install


commit 445bf6f66805ad4ba1ec0cf1983fa96931c56356
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:27:12 2011 -0600

    Removed old CMakeSubDirs.txt file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2505d99..4afb41d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,5 @@ else()
   set(service_locator_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 endif()
 
-# Include the subdirectory information. This is separate so that
-# a higher-level CMakeLists.txt can act as a master for integrated
-# builds.
-include(CMakeSubDirs.txt)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 632bec7..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-# Take care of the source code for this project
-add_subdirectory(src)
-
-# Finally take care of the test suite
-add_subdirectory(test)
\ No newline at end of file

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


-- 
asterisk-scf/integration/servicediscovery.git