[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 13:05:37 CST 2011
branch "master" has been updated
via 853b36ba80ed5692b9f4b2acbfaa22f5f65cff2d (commit)
from 315704575dbed670c809a8c637b13eab1b14c64e (commit)
Summary of changes:
AmiCollector/CMakeLists.txt | 4 ++++
SmartProxy/CMakeLists.txt | 2 +-
StateReplicator/CMakeLists.txt | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit 853b36ba80ed5692b9f4b2acbfaa22f5f65cff2d
Author: David M. Lee <dlee at digium.com>
Date: Thu Jan 20 12:38:37 2011 -0600
Refactored out several install functions for installation.
* asterisk_scf_component_install - Install a component
* asterisk_scf_headers_install - Install .h files
* asterisk_scf_slice_headers_install - Install generated .h files
* asterisk_scf_slice_install - Install .ice files
diff --git a/AmiCollector/CMakeLists.txt b/AmiCollector/CMakeLists.txt
index 46a8e75..8233f7f 100644
--- a/AmiCollector/CMakeLists.txt
+++ b/AmiCollector/CMakeLists.txt
@@ -10,4 +10,8 @@ asterisk_scf_component_add_boost_libraries(ami-collector thread)
asterisk_scf_component_build_library(ami-collector)
+# don't install the component. it's just there to make Visual Studio happy
+# _do_ install the header files
+asterisk_scf_headers_install(include/)
+
add_subdirectory(test)
diff --git a/SmartProxy/CMakeLists.txt b/SmartProxy/CMakeLists.txt
index 51e7331..bdbe333 100644
--- a/SmartProxy/CMakeLists.txt
+++ b/SmartProxy/CMakeLists.txt
@@ -29,4 +29,4 @@ 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})
+asterisk_scf_headers_install(include/)
diff --git a/StateReplicator/CMakeLists.txt b/StateReplicator/CMakeLists.txt
index a17bd75..472c21c 100644
--- a/StateReplicator/CMakeLists.txt
+++ b/StateReplicator/CMakeLists.txt
@@ -23,4 +23,4 @@ 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})
+asterisk_scf_headers_install(include/)
-----------------------------------------------------------------------
--
asterisk-scf/release/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list