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 afd1fd49695b0dad9cca6f00749384568c214a9e (commit)
via 17a0703d205d26048247e22174a1eda36498d341 (commit)
from 6a7f9c025da31eff3cd63dd85c16dc5aad0534fe (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=afd1fd49695b0dad9cca6f00749384568c214a9e
commit afd1fd49695b0dad9cca6f00749384568c214a9e
Merge: 6a7f9c0 17a0703
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 10:58:37 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 11 10:58:37 2017 -0500
Merge topic 'fix_get_prerequisites' into next
17a0703d GetPrerequisites: Do not fail on files we cannot find
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a0703d205d26048247e22174a1eda36498d341
commit 17a0703d205d26048247e22174a1eda36498d341
Author: Martin Koegler <martin.koeg...@chello.at>
AuthorDate: Tue Jan 10 23:28:47 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 11 10:57:04 2017 -0500
GetPrerequisites: Do not fail on files we cannot find
Historically we have always warned and skipped missing files. Since
commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for
execute_process() calls, 2015-07-29) we fail instead, but this was not
an intentional part of that change. Restore the warn-only behavior so
that missing system libraries (e.g. during cross-compiling) do not cause
failure.
Closes: #16523
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 72775ce..d6a78de 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -654,6 +654,8 @@ function(get_prerequisites target prerequisites_var
exclude_system recurse exepa
if(NOT EXISTS "${target}")
message("warning: target '${target}' does not exist...")
+ set(${prerequisites_var} "" PARENT_SCOPE)
+ return()
endif()
set(gp_cmd_paths ${gp_cmd_paths}
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
