[Cmake-commits] CMake branch, next, updated. v3.1.0-1523-g8b10da3
Brad King
brad.king at kitware.com
Thu Jan 8 14:14:39 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8b10da3c7437e7486b0a2661c9439e58c94b0bca (commit)
via cbaf0802a5646dd1fdf9fabc0f0c274621349619 (commit)
from 4a844a8df23ed6798884a655942f9ca700800520 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b10da3c7437e7486b0a2661c9439e58c94b0bca
commit 8b10da3c7437e7486b0a2661c9439e58c94b0bca
Merge: 4a844a8 cbaf080
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 8 14:14:38 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 14:14:38 2015 -0500
Merge topic 'FindIce-CMP0054' into next
cbaf0802 FindIce: Port to work with CMP0054 NEW behavior
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbaf0802a5646dd1fdf9fabc0f0c274621349619
commit cbaf0802a5646dd1fdf9fabc0f0c274621349619
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 4 14:06:14 2015 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 8 14:13:48 2015 -0500
FindIce: Port to work with CMP0054 NEW behavior
Do not quote if() arguments meant to test variable definitions.
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)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list