[Cmake-commits] CMake branch, master, updated. v3.2.2-1375-g836c4e9
Brad King
brad.king at kitware.com
Mon Jun 1 09:37:36 EDT 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, master has been updated
via 836c4e9314f5afbde132ae34ed5cbfd5e422f905 (commit)
via d4c6531a945564d230200512c680ca8570b10a6c (commit)
from 02c4aa1f97f5436e3f2f2ba07c492a24bad04c4f (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=836c4e9314f5afbde132ae34ed5cbfd5e422f905
commit 836c4e9314f5afbde132ae34ed5cbfd5e422f905
Merge: 02c4aa1 d4c6531
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 1 09:37:34 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 1 09:37:34 2015 -0400
Merge topic 'FindPkgConfig_fix_extra_path'
d4c6531a FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 2 +-
...ONFIG_PATH.cmake => FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake} | 6 +++---
...ONFIG_PATH.cmake => FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake} | 6 +++---
Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | 5 +++++
4 files changed, 12 insertions(+), 7 deletions(-)
copy Tests/RunCMake/FindPkgConfig/{FindPkgConfig_PKGCONFIG_PATH.cmake => FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake} (87%)
copy Tests/RunCMake/FindPkgConfig/{FindPkgConfig_PKGCONFIG_PATH.cmake => FindPkgConfig_CMAKE_FRAMEWORK_PATH.cmake} (87%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list