[Cmake-commits] CMake branch, next, updated. v2.8.7-3452-ge90e946

Rolf Eike Beer eike at sf-mail.de
Fri Apr 13 16:57:13 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  e90e946e3c30055e858e20c8312260fb7b0dac37 (commit)
       via  8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8 (commit)
       via  ad3d2b450f1c2454cd1a3f416ef97631e2937eef (commit)
       via  89a67804bfc3104ec5b928d9b287c95f7f001793 (commit)
       via  621c0893b86bdda304424115071f23146836c8a4 (commit)
      from  a3ae2b41751f15da619d19bec3caad30ee84d71c (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=e90e946e3c30055e858e20c8312260fb7b0dac37
commit e90e946e3c30055e858e20c8312260fb7b0dac37
Merge: a3ae2b4 8bd38d7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Apr 13 16:57:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 13 16:57:11 2012 -0400

    Merge topic 'fix-pkgconfig-13125' into next
    
    8bd38d7 FindPkgConfig.cmake: fix documented output variable no longer set (#13125)
    ad3d2b4 KWSys Nightly Date Stamp
    89a6780 KWSys Nightly Date Stamp
    621c089 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8
commit 8bd38d7070b1cec6ed27b71d0359f1b2ccd1e1c8
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: Fri Apr 13 22:51:14 2012 +0200

    FindPkgConfig.cmake: fix documented output variable no longer set (#13125)
    
    The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 5d93ab1..30aab45 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:
 Modules/FindPkgConfig.cmake                   |    8 ++++++--
 Source/kwsys/kwsysDateStamp.cmake             |    2 +-
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt |    3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list