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

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jan 20 13:05:36 CST 2011


branch "master" has been updated
       via  44eae42bc428ca2b83487e611f31c79260d1b322 (commit)
      from  7abce953fdf0254467e6d73382d3336cbc6c497b (commit)

Summary of changes:
 CMakeLists.txt            |    4 +---
 server/src/CMakeLists.txt |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 44eae42bc428ca2b83487e611f31c79260d1b322
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 20 12:33:26 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/CMakeLists.txt b/CMakeLists.txt
index 8eb0313..0c055ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,5 @@ include_directories(${API_INCLUDE_DIR})
 asterisk_scf_component_build_library(logging-client)
 target_link_libraries(logging-client asterisk-scf-api)
 
-install(TARGETS logging-client
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_BIN_DIR})
+asterisk_scf_component_install(logging-client)
 install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index 2946930..e3f1d86 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -43,6 +43,4 @@ asterisk_scf_component_add_file(logging-service main.cpp)
 asterisk_scf_component_build_icebox(logging-service)
 target_link_libraries(logging-service logging-service-lib)
 
-install(TARGETS logging-service
-    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
-    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
+asterisk_scf_component_install(logging-service)

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


-- 
asterisk-scf/release/logger.git



More information about the asterisk-scf-commits mailing list