From d5047ca1b298a52c605be5f05a6458c8147872ae Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Tue, 9 Sep 2014 16:28:11 +0100
Subject: [PATCH 1/2] FindIce: Remove unneeded search path modification

Drop code adding redundant "/opt/Ice-${ice_version}" paths.
---
 Modules/FindIce.cmake | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index c437a4065..50bc60e29 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -242,13 +242,6 @@ function(_Ice_FIND)
 
   message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
 
-  # The following searches prefer the version found; note reverse
-  # order due to prepending.
-  if(NOT MSVC)
-    list(INSERT ice_roots 0 "/opt/Ice-${Ice_VERSION_SLICE2CPP_SHORT}")
-    list(INSERT ice_roots 0 "/opt/Ice-${Ice_VERSION_SLICE2CPP_FULL}")
-  endif()
-
   # Find include directory
   find_path(Ice_INCLUDE_DIR
             NAMES "Ice/Ice.h"

From 2131aeddaa6e9db8f9671bdee0358039fb570b4a Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@codelibre.net>
Date: Tue, 9 Sep 2014 18:48:28 +0000
Subject: [PATCH 2/2] FindIce: Respect Ice_FIND_QUIETLY when printing messages

---
 Modules/FindIce.cmake | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 50bc60e29..60a41075d 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -240,7 +240,9 @@ function(_Ice_FIND)
     set(Ice_VERSION "${Ice_VERSION_SLICE2CPP_FULL}" PARENT_SCOPE)
   endif()
 
-  message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
+  if(NOT Ice_FIND_QUIETLY)
+    message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
+  endif()
 
   # Find include directory
   find_path(Ice_INCLUDE_DIR
@@ -305,17 +307,19 @@ function(_Ice_FIND)
   set(_Ice_REQUIRED_LIBS_FOUND "${Ice_REQUIRED_LIBS_FOUND}" PARENT_SCOPE)
   set(Ice_LIBRARY "${Ice_LIBRARY}" PARENT_SCOPE)
 
-  if(Ice_LIBS_FOUND)
-    message(STATUS "Found the following Ice libraries:")
-    foreach(found ${Ice_LIBS_FOUND})
-      message(STATUS "  ${found}")
-    endforeach()
-  endif()
-  if(Ice_LIBS_NOTFOUND)
-    message(STATUS "The following Ice libraries were not found:")
-    foreach(notfound ${Ice_LIBS_NOTFOUND})
-      message(STATUS "  ${notfound}")
-    endforeach()
+  if(NOT Ice_FIND_QUIETLY)
+    if(Ice_LIBS_FOUND)
+      message(STATUS "Found the following Ice libraries:")
+      foreach(found ${Ice_LIBS_FOUND})
+        message(STATUS "  ${found}")
+      endforeach()
+    endif()
+    if(Ice_LIBS_NOTFOUND)
+      message(STATUS "The following Ice libraries were not found:")
+      foreach(notfound ${Ice_LIBS_NOTFOUND})
+        message(STATUS "  ${notfound}")
+      endforeach()
+    endif()
   endif()
 
   if(Ice_DEBUG)