[Cmake-commits] CMake branch, next, updated. v2.8.7-3454-g0f6f526
Rolf Eike Beer
eike at sf-mail.de
Sun Apr 15 02:29:34 EDT 2012
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 0f6f526eb0bda6c8e6b00ee841ee777a27b21a04 (commit)
via 216f93582b090b8c5f4c933fb4003d6f1d8e2bbc (commit)
from e90e946e3c30055e858e20c8312260fb7b0dac37 (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=0f6f526eb0bda6c8e6b00ee841ee777a27b21a04
commit 0f6f526eb0bda6c8e6b00ee841ee777a27b21a04
Merge: e90e946 216f935
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Apr 15 02:29:31 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 15 02:29:31 2012 -0400
Merge topic 'fix-pkgconfig-13125' into next
216f935 really fix #13125 (and #13132)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=216f93582b090b8c5f4c933fb4003d6f1d8e2bbc
commit 216f93582b090b8c5f4c933fb4003d6f1d8e2bbc
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Apr 15 08:28:40 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Apr 15 08:28:40 2012 +0200
really fix #13125 (and #13132)
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 30aab45..39d3a76 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -106,7 +106,7 @@ find_package_handle_standard_args(PkgConfig
# This is needed because the module name is "PkgConfig" but the name of
# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
# handled by FPHSA.
-set(PKG_CONFIG_FOUND "${PkgConfig_FOUND}")
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
# Unsets the given variables
macro(_pkgconfig_unset var)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list