[Cmake-commits] CMake branch, master, updated. v3.14.5-1259-g0a68c30
Kitware Robot
kwrobot at kitware.com
Tue Jun 4 12:13:06 EDT 2019
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, master has been updated
via 0a68c30b81020dde3f149d9b02a598925d746d31 (commit)
via 0da2c35d6bf0741ce91c682414b56fdca83160d8 (commit)
from 98004612f6b5c613d49dde85549d0d556e91a60d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a68c30b81020dde3f149d9b02a598925d746d31
commit 0a68c30b81020dde3f149d9b02a598925d746d31
Merge: 9800461 0da2c35
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 4 16:09:33 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jun 4 12:09:41 2019 -0400
Merge topic 'GetPrerequisites-variable-typo'
0da2c35d6b GetPrerequisites: fix regression in gp_append_unique
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3421
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0da2c35d6bf0741ce91c682414b56fdca83160d8
commit 0da2c35d6bf0741ce91c682414b56fdca83160d8
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Jun 4 11:55:56 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 4 12:00:06 2019 -0400
GetPrerequisites: fix regression in gp_append_unique
The `item` variable was the loop variable in the old code prior to
commit 3dfc8b9bd6 (GetPrerequisites: use if(IN_LIST) instead of foreach,
2019-05-09). The function argument `value` should be used instead.
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 06655a4..5be4676 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -173,7 +173,7 @@ cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW) # if IN_LIST
function(gp_append_unique list_var value)
- if(NOT item IN_LIST ${list_var})
+ if(NOT value IN_LIST ${list_var})
set(${list_var} ${${list_var}} "${value}" PARENT_SCOPE)
endif()
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list