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 8007742a3a19ff7d9fded4ee7a8aeec8201dce1f (commit)
via ae39fdb6abaf63e7011652de801fbd4b478b2002 (commit)
from e8da83dac6744b6c72fc19ca6372ea0feb2ccbdd (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=8007742a3a19ff7d9fded4ee7a8aeec8201dce1f
commit 8007742a3a19ff7d9fded4ee7a8aeec8201dce1f
Merge: e8da83d ae39fdb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 23 13:52:14 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 23 13:52:14 2016 -0400
Merge topic 'extend-find-package-search-path' into next
ae39fdb6 fixup! find_package: Extend search path for combined Windows/UNIX
convention
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae39fdb6abaf63e7011652de801fbd4b478b2002
commit ae39fdb6abaf63e7011652de801fbd4b478b2002
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Aug 23 13:51:51 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Aug 23 13:51:51 2016 -0400
fixup! find_package: Extend search path for combined Windows/UNIX convention
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 62a0400..8338c2a 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1961,7 +1961,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string
const& prefix_in)
}
}
- // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/cmake/(Foo|foo|FOO).*/
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/cmake/(Foo|foo|FOO).*/
{
cmFindPackageFileList lister(this);
lister / cmFileListGeneratorFixed(prefix) /
@@ -1974,7 +1974,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string
const& prefix_in)
}
}
- // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/
{
cmFindPackageFileList lister(this);
lister / cmFileListGeneratorFixed(prefix) /
@@ -1986,7 +1986,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string
const& prefix_in)
}
}
- //
PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/(cmake|CMake)/
+ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/(cmake|CMake)/
{
cmFindPackageFileList lister(this);
lister / cmFileListGeneratorFixed(prefix) /
-----------------------------------------------------------------------
Summary of changes:
Source/cmFindPackageCommand.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
