kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindIce-updates' 

2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages
d5047ca1 FindIce: Remove unneeded search path modification
This commit is contained in:
Brad King 2014-09-10 11:23:17 -04:00 committed by CMake Topic Stage
parent 3d290c111a 2131aeddaa
commit 81b2a250dc
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Modules/FindIce.cmake
View File

@ -240,13 +240,8 @@ function(_Ice_FIND)
set(Ice_VERSION "${Ice_VERSION_SLICE2CPP_FULL}" PARENT_SCOPE) set(Ice_VERSION "${Ice_VERSION_SLICE2CPP_FULL}" PARENT_SCOPE)
endif() endif()
message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}") if(NOT Ice_FIND_QUIETLY)
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() endif()
# Find include directory # Find include directory
@ -312,17 +307,19 @@ function(_Ice_FIND)
set(_Ice_REQUIRED_LIBS_FOUND "${Ice_REQUIRED_LIBS_FOUND}" PARENT_SCOPE) set(_Ice_REQUIRED_LIBS_FOUND "${Ice_REQUIRED_LIBS_FOUND}" PARENT_SCOPE)
set(Ice_LIBRARY "${Ice_LIBRARY}" PARENT_SCOPE) set(Ice_LIBRARY "${Ice_LIBRARY}" PARENT_SCOPE)
if(Ice_LIBS_FOUND) if(NOT Ice_FIND_QUIETLY)
message(STATUS "Found the following Ice libraries:") if(Ice_LIBS_FOUND)
foreach(found ${Ice_LIBS_FOUND}) message(STATUS "Found the following Ice libraries:")
message(STATUS " ${found}") foreach(found ${Ice_LIBS_FOUND})
endforeach() message(STATUS " ${found}")
endif() endforeach()
if(Ice_LIBS_NOTFOUND) endif()
message(STATUS "The following Ice libraries were not found:") if(Ice_LIBS_NOTFOUND)
foreach(notfound ${Ice_LIBS_NOTFOUND}) message(STATUS "The following Ice libraries were not found:")
message(STATUS " ${notfound}") foreach(notfound ${Ice_LIBS_NOTFOUND})
endforeach() message(STATUS " ${notfound}")
endforeach()
endif()
endif() endif()
if(Ice_DEBUG) if(Ice_DEBUG)