FindIce: Port to work with CMP0054 NEW behavior
Do not quote if() arguments meant to test variable definitions.
This commit is contained in:
parent
c118816d44
commit
cbaf0802a5
|
@ -282,21 +282,21 @@ function(_Ice_FIND)
|
|||
PATH_SUFFIXES ${ice_library_suffixes}
|
||||
DOC "Ice ${component} library")
|
||||
mark_as_advanced("${component_cache}")
|
||||
if("${component_cache}")
|
||||
if(${component_cache})
|
||||
set("${component_found}" ON)
|
||||
list(APPEND Ice_LIBRARY "${${component_cache}}")
|
||||
endif()
|
||||
mark_as_advanced("${component_found}")
|
||||
set("${component_cache}" "${${component_cache}}" PARENT_SCOPE)
|
||||
set("${component_found}" "${${component_found}}" PARENT_SCOPE)
|
||||
if("${component_found}")
|
||||
if ("Ice_FIND_REQUIRED_${component}")
|
||||
if(${component_found})
|
||||
if (Ice_FIND_REQUIRED_${component})
|
||||
list(APPEND Ice_LIBS_FOUND "${component} (required)")
|
||||
else()
|
||||
list(APPEND Ice_LIBS_FOUND "${component} (optional)")
|
||||
endif()
|
||||
else()
|
||||
if ("Ice_FIND_REQUIRED_${component}")
|
||||
if (Ice_FIND_REQUIRED_${component})
|
||||
set(Ice_REQUIRED_LIBS_FOUND OFF)
|
||||
list(APPEND Ice_LIBS_NOTFOUND "${component} (required)")
|
||||
else()
|
||||
|
@ -356,7 +356,7 @@ if(Ice_FOUND)
|
|||
set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY")
|
||||
set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES")
|
||||
set(_Ice_component_found "${_Ice_component_upcase}_FOUND")
|
||||
if("${_Ice_component_found}")
|
||||
if(${_Ice_component_found})
|
||||
set("${_Ice_component_lib}" "${${_Ice_component_cache}}")
|
||||
endif()
|
||||
unset(_Ice_component_upcase)
|
||||
|
|
Loading…
Reference in New Issue