[Cmake-commits] CMake branch, next, updated. v2.8.7-3456-g01460d5

[Rolf Eike Beer]

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  01460d545bc65d6dbd9eaaecc170e98f897b43fe (commit)
       via  3ea850a5023060b84dcc0e6f0098c32c28b15807 (commit)
      from  0f6f526eb0bda6c8e6b00ee841ee777a27b21a04 (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=01460d545bc65d6dbd9eaaecc170e98f897b43fe
commit 01460d545bc65d6dbd9eaaecc170e98f897b43fe
Merge: 0f6f526 3ea850a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Apr 15 02:44:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 15 02:44:43 2012 -0400

    Merge topic 'fix-pkgconfig-13125' into next
    
    3ea850a FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ea850a5023060b84dcc0e6f0098c32c28b15807
commit 3ea850a5023060b84dcc0e6f0098c32c28b15807
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Apr 13 08:50:49 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Apr 15 08:39:51 2012 +0200

    FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
    
    The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
    An additional hint to really get this fixed came from Rex Dieter.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 5d93ab1..39d3a76 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -13,11 +13,10 @@
 # When the 'QUIET' argument is set, no status messages will be printed.
 #
 # It sets the following variables:
-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
+#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
 #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
 #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
 #                                 (since CMake 2.8.8)
-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
 #
 # For the following variables two sets of values exist; first one is the
 # common one and has the given PREFIX. The second set contains flags
@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
 
+# 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}")
+
 # Unsets the given variables
 macro(_pkgconfig_unset var)
   set(${var} "" CACHE INTERNAL "")
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 6604208..fc65e58 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -71,7 +71,7 @@ endmacro(check_version_string)
 # reported.
 
 foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
-        JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
+        JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
     check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
 endforeach(VTEST)
 
@@ -82,4 +82,3 @@ endforeach(VTEST)
 
 check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
 check_version_string(SUBVERSION Subversion_VERSION_SVN)
-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake