[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  1e6785859bd27e26334977be46a4aef2a0c43692 (commit)
       via  c6433519a74dd92d72f01fdb6518d9959114c829 (commit)
      from  c1bbe352913e5ad8a06ffe396ad573f1d85e0796 (commit)

Summary of changes:
 cmake/modules/FindIce.cmake    |    4 ++--
 cmake/modules/FindIceBox.cmake |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 1e6785859bd27e26334977be46a4aef2a0c43692
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Nov 7 12:01:19 2011 -0400

    Allow the location of Icebox to be explicitly specified. (issue ASTSCF-321)

diff --git a/cmake/modules/FindIceBox.cmake b/cmake/modules/FindIceBox.cmake
index dc27d4f..d45fee0 100644
--- a/cmake/modules/FindIceBox.cmake
+++ b/cmake/modules/FindIceBox.cmake
@@ -68,8 +68,8 @@ function(_ice_find_program program)
     list(APPEND _ice_progdirs "bin")
   endif()
 
-  find_program(ICE_${upper}_PROGRAM_RELEASE NAMES "${program}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_progdirs})
-  find_program(ICE_${upper}_PROGRAM_DEBUG NAMES "${program}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_progdirs})
+  find_program(ICE_${upper}_PROGRAM_RELEASE NAMES "${program}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICEBOX_DIR}" PATH_SUFFIXES ${_ice_progdirs})
+  find_program(ICE_${upper}_PROGRAM_DEBUG NAMES "${program}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICEBOX_DIR}" PATH_SUFFIXES ${_ice_progdirs})
   
   mark_as_advanced(ICE_${upper}_PROGRAM_RELEASE ICE_${upper}_PROGRAM_DEBUG)
 

commit c6433519a74dd92d72f01fdb6518d9959114c829
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Nov 7 12:00:33 2011 -0400

    Allow the location of the Ice libraries to be explicitly specified. (issue ASTSCF-320)

diff --git a/cmake/modules/FindIce.cmake b/cmake/modules/FindIce.cmake
index a300d39..9d8f382 100644
--- a/cmake/modules/FindIce.cmake
+++ b/cmake/modules/FindIce.cmake
@@ -146,8 +146,8 @@ function(_ice_find_library library)
     list(APPEND _ice_libdirs "lib")
   endif()
 
-  find_library(ICE_${upper}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_libdirs})
-  find_library(ICE_${upper}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" PATH_SUFFIXES ${_ice_libdirs})
+  find_library(ICE_${upper}_LIBRARY_RELEASE NAMES "${library}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICE_LIBRARY_DIR}" PATH_SUFFIXES ${_ice_libdirs})
+  find_library(ICE_${upper}_LIBRARY_DEBUG NAMES "${library}${_ice_debug_suffix}" NO_DEFAULT_PATH HINTS "${ICE_DIR}" "${ICE_LIBRARY_DIR}" PATH_SUFFIXES ${_ice_libdirs})
   
   mark_as_advanced(ICE_${upper}_LIBRARY_RELEASE ICE_${upper}_LIBRARY_DEBUG)
 

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


-- 
asterisk-scf/integration/gitall.git