[Cmake-commits] CMake branch, master, updated. v3.0.0-rc2-339-gb048a3e
Brad King
brad.king at kitware.com
Thu Mar 20 09:22:26 EDT 2014
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 b048a3edd031f1674c912353c968087a9f059ea3 (commit)
via cc5a0d8f42f9ad8bc5ac50be343db05128a0c6ea (commit)
via 453d2b2438a1c9e8a21e89addf446f5bec3a4000 (commit)
from 82c590b12ed7301539202b0af92f8181f7708f16 (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=b048a3edd031f1674c912353c968087a9f059ea3
commit b048a3edd031f1674c912353c968087a9f059ea3
Merge: 82c590b cc5a0d8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 09:22:25 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 09:22:25 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2'
cc5a0d8f FindPkgConfig: More unit tests
453d2b24 FindPkgConfig: small refactoring
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 55 +++++++++++---------
.../FindPkgConfig_NO_PKGCONFIG_PATH.cmake | 41 +++++++++++++++
.../FindPkgConfig_PKGCONFIG_PATH.cmake | 2 +-
...PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake} | 12 ++---
...ndPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake} | 12 ++---
Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | 3 ++
Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat | 2 +
Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh | 4 +-
8 files changed, 92 insertions(+), 39 deletions(-)
create mode 100644 Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
copy Tests/RunCMake/FindPkgConfig/{FindPkgConfig_PKGCONFIG_PATH.cmake => FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake} (79%)
copy Tests/RunCMake/FindPkgConfig/{FindPkgConfig_PKGCONFIG_PATH.cmake => FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_PATH.cmake} (64%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list