diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-10 15:23:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-10 15:23:17 (GMT) |
| commit | 81b2a250dcd70b5d8d6cd30b33e2f916b5377dd3 (patch) | |
| tree | b13784f58021b1aafceb5b37ef4b8a1eaa0a2db2 /Modules | |
| parent | 3d290c111ae8471d3c21ed58225392d982090a9f (diff) | |
| parent | 2131aeddaa6e9db8f9671bdee0358039fb570b4a (diff) | |
| download | CMake-81b2a250dcd70b5d8d6cd30b33e2f916b5377dd3.zip CMake-81b2a250dcd70b5d8d6cd30b33e2f916b5377dd3.tar.gz CMake-81b2a250dcd70b5d8d6cd30b33e2f916b5377dd3.tar.bz2 | |
Merge topic 'FindIce-updates'
2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages
d5047ca1 FindIce: Remove unneeded search path modification
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindIce.cmake | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index c437a40..60a4107 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -240,13 +240,8 @@ function(_Ice_FIND) set(Ice_VERSION "${Ice_VERSION_SLICE2CPP_FULL}" PARENT_SCOPE) endif() - 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}") + if(NOT Ice_FIND_QUIETLY) + message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}") endif() # Find include directory @@ -312,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) |