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:
commit
81b2a250dc
@ -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()
|
||||||
|
|
||||||
|
if(NOT Ice_FIND_QUIETLY)
|
||||||
message(STATUS "Ice version: ${Ice_VERSION_SLICE2CPP_FULL}")
|
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,6 +307,7 @@ 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(NOT Ice_FIND_QUIETLY)
|
||||||
if(Ice_LIBS_FOUND)
|
if(Ice_LIBS_FOUND)
|
||||||
message(STATUS "Found the following Ice libraries:")
|
message(STATUS "Found the following Ice libraries:")
|
||||||
foreach(found ${Ice_LIBS_FOUND})
|
foreach(found ${Ice_LIBS_FOUND})
|
||||||
@ -324,6 +320,7 @@ function(_Ice_FIND)
|
|||||||
message(STATUS " ${notfound}")
|
message(STATUS " ${notfound}")
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
if(Ice_DEBUG)
|
if(Ice_DEBUG)
|
||||||
message(STATUS "--------FindIce.cmake search debug--------")
|
message(STATUS "--------FindIce.cmake search debug--------")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user