[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-332-g41b82db
Brad King
brad.king at kitware.com
Mon Mar 17 09:50:00 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 41b82db6855a26d01e1000b59da1792b954b326a (commit)
via 3df5147043d83aa09acd5c9ce31d5c602efb99db (commit)
from 6aaaa6d0bd584b05a1492b3861e3589f5ffe544d (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=41b82db6855a26d01e1000b59da1792b954b326a
commit 41b82db6855a26d01e1000b59da1792b954b326a
Merge: 6aaaa6d 3df5147
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 17 09:49:58 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 09:49:58 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH'
3df51470 FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 158 +++++++++++++++++++-
Tests/RunCMake/CMakeLists.txt | 5 +
.../{CMP0022 => FindPkgConfig}/CMakeLists.txt | 0
.../FindPkgConfig_PKGCONFIG_PATH.cmake | 51 +++++++
Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | 3 +
Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat | 16 ++
Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh | 20 +++
.../lib/i386-linux-gnu/pkgconfig/.placeholder | 0
.../pc-bar/lib/pkgconfig/.placeholder | 0
.../lib/x86_64-linux-gnu/pkgconfig/.placeholder | 0
.../pc-bar/lib64/pkgconfig/.placeholder | 0
.../lib/i386-linux-gnu/pkgconfig/.placeholder | 0
.../pc-foo/lib/pkgconfig/.placeholder | 0
.../lib/x86_64-linux-gnu/pkgconfig/.placeholder | 0
.../pc-foo/lib64/pkgconfig/.placeholder | 0
15 files changed, 245 insertions(+), 8 deletions(-)
copy Tests/RunCMake/{CMP0022 => FindPkgConfig}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
create mode 100644 Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake
create mode 100755 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
create mode 100755 Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-bar/lib/i386-linux-gnu/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-bar/lib/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-bar/lib/x86_64-linux-gnu/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-bar/lib64/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-foo/lib/i386-linux-gnu/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-foo/lib/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-foo/lib/x86_64-linux-gnu/pkgconfig/.placeholder (100%)
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/FindPkgConfig/pc-foo/lib64/pkgconfig/.placeholder (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list