[asterisk-scf-commits] asterisk-scf/release/cmake.git branch "icebox" updated.

[Commits to the Asterisk SCF project code repositories]

branch "icebox" has been updated
       via  e1858e0410448c2e50593df13df14c25851dc3e4 (commit)
      from  a4e3391cfdf40c9ba904f33dfec8ecdc68a79b73 (commit)

Summary of changes:
 AsteriskSCF.cmake |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 AsteriskSCF.cmake


- Log -----------------------------------------------------------------
commit e1858e0410448c2e50593df13df14c25851dc3e4
Author: David M. Lee <dlee at digium.com>
Date:   Tue Sep 28 15:31:07 2010 -0500

    Find icebox in ICE_HOME.

diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
old mode 100644
new mode 100755
index 5fdec08..d337223
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -121,6 +121,15 @@ function(find_ICE version)
   endif()
   file(TO_CMAKE_PATH "${ice}" ice_cmake_path)
   set_cache_var(ICE_DIR "${ice_cmake_path}")
+
+  # find icebox executable
+  find_program(ICEBOX icebox PATHS "${ICE_DIR}/bin" NO_DEFAULT_PATH)
+
+  if(ICEBOX)
+    message(STATUS "Found icebox at ${ICEBOX}")
+  else()
+    message(FATAL_ERROR "Failed to find icebox ${ICE_DIR}")
+  endif()
 endfunction()
 
 # Find Ice headers and libraries for CXX components
@@ -842,5 +851,5 @@ function(boost_add_test EXE)
 endfunction()
 
 function(icebox_add_test NAME CONFIG)
-   add_test(NAME ${NAME} COMMAND icebox --Ice.Config=${CONFIG})
+   add_test(NAME ${NAME} COMMAND ${ICEBOX} --Ice.Config=${CONFIG})
 endfunction()

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


-- 
asterisk-scf/release/cmake.git