diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-08 19:57:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-08 19:57:53 (GMT) |
| commit | 35ea14050ee41f9ea1c540ef2f582607b3d50925 (patch) | |
| tree | 3e5c06e46f1873c31028e4e3461072d5aba9d904 | |
| parent | 04e880fd33ca8a95ef15354f1791f151fe7a54e5 (diff) | |
| parent | cbaf0802a5646dd1fdf9fabc0f0c274621349619 (diff) | |
| download | CMake-35ea14050ee41f9ea1c540ef2f582607b3d50925.zip CMake-35ea14050ee41f9ea1c540ef2f582607b3d50925.tar.gz CMake-35ea14050ee41f9ea1c540ef2f582607b3d50925.tar.bz2 | |
Merge topic 'FindIce-CMP0054'
cbaf0802 FindIce: Port to work with CMP0054 NEW behavior
| -rw-r--r-- | Modules/FindIce.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 76cecc1..8493d80 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -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) |