[asterisk-scf-commits] asterisk-scf/release/test_channel.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  e1a841a22e980cd585e18e4f1b4e3f67cc1d50d5 (commit)
      from  39340b9a0c43ec386c7a270ffed22544f002b17e (commit)

Summary of changes:
 local_slice/CMakeLists.txt |   10 +++-------
 src/CMakeLists.txt         |    7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit e1a841a22e980cd585e18e4f1b4e3f67cc1d50d5
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 20 12:33:27 2011 -0600

    Refactored out several install functions for installation.
    
    * asterisk_scf_component_install - Install a component
    * asterisk_scf_slice_headers_install - Install generated .h files
    * asterisk_scf_slice_install - Install .ice files

diff --git a/local_slice/CMakeLists.txt b/local_slice/CMakeLists.txt
index 85cbc7e..6ca7452 100644
--- a/local_slice/CMakeLists.txt
+++ b/local_slice/CMakeLists.txt
@@ -17,10 +17,6 @@ asterisk_scf_component_build_library(test-channel-api)
 set(TEST_CHANNEL_API_INCLUDE_DIR
     ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
 
-install(TARGETS test-channel-api
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
-install(DIRECTORY AsteriskSCF DESTINATION ${ASTERISK_SCF_INSTALL_SLICE_DIR})
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/
-    DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR}
-    FILES_MATCHING PATTERN "*.h")
+asterisk_scf_component_install(test-channel-api)
+asterisk_scf_slice_headers_install()
+asterisk_scf_slice_install(AsteriskSCF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 927ef1d..98e88b4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,9 +14,7 @@ asterisk_scf_component_build_icebox(test_channel)
 target_link_libraries(test_channel asterisk-scf-api)
 target_link_libraries(test_channel test-channel-api)
 
-install(TARGETS test_channel
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+asterisk_scf_component_install(test_channel)
 
 asterisk_scf_component_init(console_driver CXX)
 asterisk_scf_component_add_file(console_driver ConsoleDriver.cpp)
@@ -27,5 +25,4 @@ include_directories(${TEST_CHANNEL_API_INCLUDE_DIR})
 asterisk_scf_component_build_standalone(console_driver)
 target_link_libraries(console_driver test-channel-api)
 
-install(TARGETS console_driver
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
+asterisk_scf_component_install(console_driver)

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


-- 
asterisk-scf/release/test_channel.git