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 e0090767808bc68481697da18e50f5f2c62dd522 (commit)
via 31c356e366d7c9c1d0bc2998e95937ec6de43232 (commit)
via aeeccc3b15c6476ecdaa51d40bb9500900d11ce2 (commit)
via 84e33e6da4aef67f5eeae06cf73fd461a2d634d6 (commit)
via 4c8760c9fb2951d897a307637a761c371e48e615 (commit)
from 2d0a24acc53b83d669955eb4933e64bb2ea8c88f (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=e0090767808bc68481697da18e50f5f2c62dd522
commit e0090767808bc68481697da18e50f5f2c62dd522
Merge: 31c356e aeeccc3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 29 09:25:45 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Aug 29 09:25:45 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31c356e366d7c9c1d0bc2998e95937ec6de43232
commit 31c356e366d7c9c1d0bc2998e95937ec6de43232
Merge: 2d0a24a 84e33e6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Aug 29 13:25:03 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Aug 29 09:25:13 2019 -0400
Merge topic 'find-no-name'
84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name
4c8760c9fb find_path: Fix crash on empty old-style list of names
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3751
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e33e6da4aef67f5eeae06cf73fd461a2d634d6
commit 84e33e6da4aef67f5eeae06cf73fd461a2d634d6
Merge: 9629176 4c8760c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 28 11:19:39 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 28 11:19:39 2019 -0400
Merge branch 'backport-find-no-name' into find-no-name
diff --cc Tests/RunCMake/find_path/RunCMakeTest.cmake
index 8b5b5b7,3afbedc..ed55f51
--- a/Tests/RunCMake/find_path/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_path/RunCMakeTest.cmake
@@@ -1,7 -1,9 +1,8 @@@
include(RunCMake)
+ run_cmake(EmptyOldStyle)
-if(WIN32 OR CYGWIN)
- run_cmake(PrefixInPATH)
-endif()
+run_cmake(FromPATHEnv)
+run_cmake(PrefixInPATH)
if(APPLE)
run_cmake(FrameworksWithSubdirs)
-----------------------------------------------------------------------
Summary of changes:
Source/cmFindBase.cxx | 2 +-
Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt | 1 +
Tests/RunCMake/find_path/EmptyOldStyle.cmake | 2 ++
Tests/RunCMake/find_path/RunCMakeTest.cmake | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle-stdout.txt
create mode 100644 Tests/RunCMake/find_path/EmptyOldStyle.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
