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

[Commits to the Asterisk SCF project code repositories]

branch "install" has been updated
       via  d547f013a8a2c85d6ff57424353f5bccb414d7fe (commit)
       via  793bdcd114872227941f4c64395e5bda7121b8c8 (commit)
       via  2f677db5d331e2cca20ac21a93ee0cf4eac59f7b (commit)
      from  5856f238c481a0db13b58d08807604374a550907 (commit)

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


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

    Properly install the SIP components.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5002c1..1251a70 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,9 @@ pjproject_link(SipSessionManager pjmedia)
 pjproject_link(SipSessionManager pjlib-util)
 pjproject_link(SipSessionManager pjlib)
 
-#asterisk_scf_component_install(SipSessionManager RUNTIME bin "SIP Session Manager" SipSessionManager)
+install(TARGETS SipSessionManager
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
 
 asterisk_scf_component_init(SipStateReplicator CXX)
 
@@ -76,4 +78,6 @@ asterisk_scf_component_build_icebox(SipStateReplicator)
 target_link_libraries(SipStateReplicator logging-client)
 target_link_libraries(SipStateReplicator asterisk-scf-api)
 
-#asterisk_scf_component_install(SipStateReplicator RUNTIME bin "Sip State Replicator" SipStateReplicator)
+install(TARGETS SipStateReplicator
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})

commit 793bdcd114872227941f4c64395e5bda7121b8c8
Merge: 5856f23 2f677db
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:28:59 2011 -0600

    Merge branch 'master' into install
    
    Conflicts:
    	CMakeSubDirs.txt

diff --cc CMakeLists.txt
index 6900dba,8a849ee..abcb21a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -36,7 -37,6 +37,5 @@@ if(NOT integrated_build STREQUAL "true"
     add_subdirectory(logger)
  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(local-slice)
+ add_subdirectory(src)
+ add_subdirectory(test)

commit 2f677db5d331e2cca20ac21a93ee0cf4eac59f7b
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:25:46 2011 -0600

    Removed old CMakeSubDirs.txt file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6900dba..8a849ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,11 @@ if(NOT integrated_build STREQUAL "true")
    # Minimum we require is 2.6
    cmake_minimum_required(VERSION 2.6)
 
-   # Include common AsteriskSCF build infrastructure. Make sure your submodules are pulled. 
+   # Include common AsteriskSCF build infrastructure. Make sure your submodules
+   # are pulled.
    include(cmake/AsteriskSCF.cmake)
 
-   # This project is C++ based and requires a minimum of 3.4 of Ice. 
+   # This project is C++ based and requires a minimum of 3.4 of Ice.
    asterisk_scf_project(SipSessionManager 3.4 CXX)
 
    # Include pjproject build integration
@@ -36,7 +37,6 @@ if(NOT integrated_build STREQUAL "true")
    add_subdirectory(logger)
 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(local-slice)
+add_subdirectory(src)
+add_subdirectory(test)
diff --git a/CMakeSubDirs.txt b/CMakeSubDirs.txt
deleted file mode 100644
index 6ad9e82..0000000
--- a/CMakeSubDirs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_subdirectory(local-slice)
-
-# Add our component's source code 
-add_subdirectory(src)
-
-# Pull in the test suite
-add_subdirectory(test)
\ No newline at end of file

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


-- 
asterisk-scf/integration/sip.git