[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Thu Jan 20 09:18:45 CST 2011


branch "master" has been updated
       via  315704575dbed670c809a8c637b13eab1b14c64e (commit)
      from  debc4ae991ace2e0149384996a7fbb6c6117019e (commit)

Summary of changes:
 SmartProxy/CMakeLists.txt           |    2 ++
 StateReplicator/CMakeLists.txt      |   10 ++++++----
 StateReplicator/test/CMakeLists.txt |    1 -
 3 files changed, 8 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 315704575dbed670c809a8c637b13eab1b14c64e
Author: David M. Lee <dlee at digium.com>
Date:   Thu Jan 13 15:21:21 2011 -0600

    Installation config

diff --git a/SmartProxy/CMakeLists.txt b/SmartProxy/CMakeLists.txt
index 3b38e29..51e7331 100644
--- a/SmartProxy/CMakeLists.txt
+++ b/SmartProxy/CMakeLists.txt
@@ -27,4 +27,6 @@ asterisk_scf_component_build_library(SmartProxy)
 include_directories(${API_INCLUDE_DIR})
 target_link_libraries(SmartProxy logging-client)
 
+# don't install the component.  it's just there to make Visual Studio happy
+# _do_ install the header files
 install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index ca5f819..a17bd75 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -12,13 +12,15 @@ asterisk_scf_component_init(StateReplicator CXX)
 
 include_directories(include)
 
-asterisk_scf_component_add_file(StateReplicator include/AsteriskSCF/StateReplicator.h)
+asterisk_scf_component_add_file(StateReplicator
+    include/AsteriskSCF/StateReplicator.h)
 asterisk_scf_component_add_file(StateReplicator src/StateReplicator.cpp)
 asterisk_scf_component_add_boost_libraries(StateReplicator thread)
- 
-asterisk_scf_component_build_library(StateReplicator)
 
-asterisk_scf_component_install(StateReplicator LIBRARY lib "State Replicator" statereplicator ARCHIVE DESTINATION lib)
+asterisk_scf_component_build_library(StateReplicator)
 
 add_subdirectory(test)
 
+# don't install the component.  it's just there to make Visual Studio happy
+# _do_ install the header files
+install(DIRECTORY include/ DESTINATION ${ASTERISK_SCF_INSTALL_INCLUDE_DIR})
diff --git a/StateReplicator/test/CMakeLists.txt b/StateReplicator/test/CMakeLists.txt
index 5ff08fd..075f348 100644
--- a/StateReplicator/test/CMakeLists.txt
+++ b/StateReplicator/test/CMakeLists.txt
@@ -9,6 +9,5 @@ asterisk_scf_component_add_slice(StateReplicatorTest ../testslice/StateReplicato
 asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
 
 asterisk_scf_component_build_standalone(StateReplicatorTest)
-asterisk_scf_component_install(StateReplicatorTest RUNTIME bin "StateReplicatorTest Component Test Driver." Test)
 
 boost_add_test(StateReplicatorTest)

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


-- 
asterisk-scf/release/ice-util-cpp.git



More information about the asterisk-scf-commits mailing list