[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "single-api-lib" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jan 13 09:50:23 CST 2011


branch "single-api-lib" has been updated
       via  9e22fb80604367ec8a4e2a5cb85a65f39476ff9b (commit)
      from  235472332766f44b7db41e9c589e9ab02603a912 (commit)

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


- Log -----------------------------------------------------------------
commit 9e22fb80604367ec8a4e2a5cb85a65f39476ff9b
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 09:38:37 2011 -0600

    Fixed install bug on Windows.
    
    Note that I'm not sure it installs properly, but it does compile properly.  And that's what's important at this point.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8c756f..0fd771d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,5 +58,7 @@ asterisk_scf_add_ice_libraries(IceStorm)
 
 asterisk_scf_component_build_library(logging-client)
 
-install(TARGETS logging-client LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR})
+install(TARGETS logging-client
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_LIB_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
 install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
index ecd1605..f43a45e 100644
--- a/server/src/CMakeLists.txt
+++ b/server/src/CMakeLists.txt
@@ -29,6 +29,6 @@ asterisk_scf_component_add_boost_libraries(logging-service core)
 
 asterisk_scf_component_build_icebox(logging-service)
 
-install(TARGETS logging-service LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})
-
-#asterisk_scf_component_install(logging-service RUNTIME bin "Logging Service" System)
+install(TARGETS logging-service
+    LIBRARY DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR}
+    RUNTIME DESTINATION ${ASTERISK_SCF_INSTALL_ICEBOX_DIR})

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


-- 
asterisk-scf/integration/logger.git



More information about the asterisk-scf-commits mailing list