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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  44414a3af228fc551c19485018373ba997a3c7b0 (commit)
      from  88b6fadd2aaa24ecbbfe56a832a6d175c9af73c6 (commit)

Summary of changes:
 Hydra_v4.cmake |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit 44414a3af228fc551c19485018373ba997a3c7b0
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Aug 24 22:53:12 2010 -0230

    Add support for accessing ICE_HOME.
    Add ../slice in slice file lookup so ICE_HOME can put to in-repo cpp build.
    Add 1.44 version to boost library search.

diff --git a/Hydra_v4.cmake b/Hydra_v4.cmake
index c30bb24..7a9b5d0 100644
--- a/Hydra_v4.cmake
+++ b/Hydra_v4.cmake
@@ -71,15 +71,19 @@ endfunction()
 
 # Find Ice installation for a specific major/minor version
 function(find_ICE version)
-  if(WIN32)
-    find_best_version(ice "C:/Ice-${version}")
-  elseif(UNIX)
-    find_best_version(ice "/opt/Ice-${version}")
+  set(ice "$ENV{ICE_HOME}")
+  if(NOT ice)
+      if(WIN32)
+        find_best_version(ice "C:/Ice-${version}")
+      elseif(UNIX)
+        find_best_version(ice "/opt/Ice-${version}")
+      endif()
   endif()
+
   if(NOT ice)
     message(FATAL_ERROR "Could not find an installation of Ice with version ${version}")
   endif()
-  find_path(ICE_SLICE_DIR Ice/Current.ice PATHS "${ice}/slice" NO_DEFAULT_PATH)
+  find_path(ICE_SLICE_DIR Ice/Current.ice PATHS "${ice}/../slice" "${ice}/slice" NO_DEFAULT_PATH)
   if(ICE_SLICE_DIR)
     message(STATUS "Found Ice Slice definitions in ${ICE_SLICE_DIR}")
   else()
@@ -156,7 +160,7 @@ endfunction()
 # Find a Boost library for CXX components
 function(find_Boost_library LIBRARY)
   if(NOT Boost_FOUND)
-    set(Boost_ADDITIONAL_VERSIONS "1.39" "1.39.0" "1.40" "1.40.0" "1.41" "1.41.0" "1.42" "1.42.0" "1.43" "1.43.0" "1.44" "1.44.0")
+    set(Boost_ADDITIONAL_VERSIONS "1.39" "1.39.0" "1.40" "1.40.0" "1.41" "1.41.0" "1.42" "1.42.0" "1.44" "1.44.0")
     find_package(Boost)
     if(NOT Boost_FOUND)
       message(FATAL_ERROR "Boost libraries not found")

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


-- 
asterisk-scf/release/cmake.git