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

[Commits to the Asterisk SCF project code repositories]

branch "ice-package" has been updated
       via  0c6bf4dd51c1735dd006c652bed58ac4ef65aa5e (commit)
      from  e22c91701e8d09c15abbe415de98bf0534f4364f (commit)

Summary of changes:
 modules/FindIce.cmake |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 0c6bf4dd51c1735dd006c652bed58ac4ef65aa5e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 18 14:27:49 2011 -0600

    Use DEFINED in expressions to check for whether environment variables
    have values, because it appears to be more reliable. Disable checking
    for ENV{ProgramFiles(x86)} because CMake does not accept this syntax.

diff --git a/modules/FindIce.cmake b/modules/FindIce.cmake
index abb3555..749f6fb 100644
--- a/modules/FindIce.cmake
+++ b/modules/FindIce.cmake
@@ -191,7 +191,7 @@ if(NOT ICE_DIR)
     find_package_handle_standard_args(Ice "Major and minor version numbers (at least) must be supplied to find Ice." ICE_DIR)
   endif()
 
-  if($ENV{ICE_HOME})
+  if(DEFINED ENV{ICE_HOME})
     # if ICE_HOME is set, we will only look there; if the version present there
     # does not satisfy the requested version, then the search will fail
     list(APPEND _ice_candidate_dirs "$ENV{ICE_HOME}")
@@ -222,12 +222,12 @@ if(NOT ICE_DIR)
     foreach(version IN LISTS _ice_candidate_versions)
       if(WIN32)
 	list(APPEND _ice_candidate_dirs "C:/Ice-${version}")
-	if(ENV{ProgramFiles})
+	if(DEFINED ENV{ProgramFiles})
 	  list(APPEND _ice_candidate_dirs "$ENV{ProgramFiles}/ZeroC/Ice-${version}")
 	endif()
-	if(ENV{ProgramFiles(x86)})
-	  list(APPEND _ice_candidate_dirs "$ENV{ProgramFiles(x86)}/ZeroC/Ice-${version}")
-	endif()
+#	if(ENV{ProgramFiles(x86)})
+#	  list(APPEND _ice_candidate_dirs "$ENV{ProgramFiles(x86)}/ZeroC/Ice-${version}")
+#	endif()
       elseif(UNIX)
 	list(APPEND _ice_candidate_dirs "/opt/Ice-${version}")
       endif()

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


-- 
asterisk-scf/release/cmake.git