[asterisk-scf-commits] asterisk-scf/integration/ice-util-c++.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Oct 28 11:40:16 CDT 2010
branch "master" has been updated
via 8330ba848c5fd0b697605dfb9bab9b42ef6214dc (commit)
from f7886c4b3ac299550ae6c81797c22d06daf82c27 (commit)
Summary of changes:
ProxyWrapper/src/CMakeLists.txt | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
- Log -----------------------------------------------------------------
commit 8330ba848c5fd0b697605dfb9bab9b42ef6214dc
Author: David M. Lee <dlee at digium.com>
Date: Thu Oct 28 11:38:30 2010 -0500
Must find boost before building the lib; fixed clean build on Mac.
diff --git a/ProxyWrapper/src/CMakeLists.txt b/ProxyWrapper/src/CMakeLists.txt
index 3ead381..383649c 100644
--- a/ProxyWrapper/src/CMakeLists.txt
+++ b/ProxyWrapper/src/CMakeLists.txt
@@ -6,6 +6,12 @@ asterisk_scf_component_add_slice(ProxyWrapper ServiceLocatorIf)
asterisk_scf_component_add_file(ProxyWrapper ProxyWrapper.h)
asterisk_scf_component_add_file(ProxyWrapper ProxyWrapper.cpp)
+if (NOT ${Boost_INCUDE_DIR})
+ find_package(Boost)
+endif()
+
+include_directories(${Boost_INCLUDE_DIR})
+
asterisk_scf_component_build_library(ProxyWrapper)
# MACH-O requires libraries for linking libraries
@@ -14,11 +20,5 @@ if(APPLE)
target_link_libraries(ProxyWrapper ${ICE_CXX_LIB_ZeroCIce})
endif()
-if (NOT ${Boost_INCUDE_DIR})
- find_package(Boost)
-endif()
-
-include_directories(${Boost_INCLUDE_DIR})
-
asterisk_scf_component_install(ProxyWrapper LIBRARY lib "Proxy Wrapper" ProxyWrapper ARCHIVE DESTINATION lib)
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-c++.git
More information about the asterisk-scf-commits
mailing list