[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-406-g449e74e

[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  449e74eba7e64a4f83aca3c8d8321269c5967541 (commit)
       via  f1fe8c18ac1fbc0e8c482064319d51812dabc615 (commit)
       via  2e351f892e8eeaec2ecfe3b8a047c340a8718f10 (commit)
      from  af3d9d44d0d2b5b78c736add58d39467094b4100 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=449e74eba7e64a4f83aca3c8d8321269c5967541
commit 449e74eba7e64a4f83aca3c8d8321269c5967541
Merge: af3d9d4 f1fe8c1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jun 18 08:35:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 18 08:35:53 2016 -0400

    Merge topic 'pkgconfig-targets' into next
    
    f1fe8c18 FindPkgConfig: define the imported targets also when the data comes from cache
    2e351f89 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1fe8c18ac1fbc0e8c482064319d51812dabc615
commit f1fe8c18ac1fbc0e8c482064319d51812dabc615
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jun 18 14:35:21 2016 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jun 18 14:35:21 2016 +0200

    FindPkgConfig: define the imported targets also when the data comes from cache

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 33290c4..c4ac0d5 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -595,12 +595,14 @@ endmacro()
    XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
 #]========================================]
 macro(pkg_check_modules _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
     _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} "${_prefix}" ${_pkg_modules})
 
     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+    _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
   endif()
 endmacro()
 
@@ -623,10 +625,10 @@ endmacro()
     pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
 #]========================================]
 macro(pkg_search_module _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
     set(_pkg_modules_found 0)
-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target "${_module0}" ${ARGN})
 
     if (NOT ${_pkg_is_silent})
       message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
@@ -650,6 +652,8 @@ macro(pkg_search_module _prefix _module0)
     endif()
 
     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
+  elseif (${_prefix}_FOUND and ${_imp_target})
+    _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path)
   endif()
 endmacro()
 

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

Summary of changes:
 Modules/FindPkgConfig.cmake |    8 ++++++--
 Source/CMakeVersion.cmake   |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake