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

FindIce: Port to work with CMP0054 NEW behavior 

Do not quote if() arguments meant to test variable definitions.
This commit is contained in:
Rolf Eike Beer 2015-01-04 14:06:14 +01:00 committed by Brad King
parent c118816d44
commit cbaf0802a5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FindIce.cmake
View File

@ -282,21 +282,21 @@ function(_Ice_FIND)
PATH_SUFFIXES ${ice_library_suffixes} PATH_SUFFIXES ${ice_library_suffixes}
DOC "Ice ${component} library") DOC "Ice ${component} library")
mark_as_advanced("${component_cache}") mark_as_advanced("${component_cache}")
if("${component_cache}") if(${component_cache})
set("${component_found}" ON) set("${component_found}" ON)
list(APPEND Ice_LIBRARY "${${component_cache}}") list(APPEND Ice_LIBRARY "${${component_cache}}")
endif() endif()
mark_as_advanced("${component_found}") mark_as_advanced("${component_found}")
set("${component_cache}" "${${component_cache}}" PARENT_SCOPE) set("${component_cache}" "${${component_cache}}" PARENT_SCOPE)
set("${component_found}" "${${component_found}}" PARENT_SCOPE) set("${component_found}" "${${component_found}}" PARENT_SCOPE)
if("${component_found}") if(${component_found})
if ("Ice_FIND_REQUIRED_${component}") if (Ice_FIND_REQUIRED_${component})
list(APPEND Ice_LIBS_FOUND "${component} (required)") list(APPEND Ice_LIBS_FOUND "${component} (required)")
else() else()
list(APPEND Ice_LIBS_FOUND "${component} (optional)") list(APPEND Ice_LIBS_FOUND "${component} (optional)")
endif() endif()
else() else()
if ("Ice_FIND_REQUIRED_${component}") if (Ice_FIND_REQUIRED_${component})
set(Ice_REQUIRED_LIBS_FOUND OFF) set(Ice_REQUIRED_LIBS_FOUND OFF)
list(APPEND Ice_LIBS_NOTFOUND "${component} (required)") list(APPEND Ice_LIBS_NOTFOUND "${component} (required)")
else() else()
@ -356,7 +356,7 @@ if(Ice_FOUND)
set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY") set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY")
set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES") set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES")
set(_Ice_component_found "${_Ice_component_upcase}_FOUND") set(_Ice_component_found "${_Ice_component_upcase}_FOUND")
if("${_Ice_component_found}") if(${_Ice_component_found})
set("${_Ice_component_lib}" "${${_Ice_component_cache}}") set("${_Ice_component_lib}" "${${_Ice_component_cache}}")
endif() endif()
unset(_Ice_component_upcase) unset(_Ice_component_upcase)