[Cmake-commits] CMake branch, next, updated. v3.3.1-2260-gb2a7e6d

[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  b2a7e6d6957d6def858382c1370feafac5371987 (commit)
       via  b9ec9392da21a3421e48c6961976060d872faffb (commit)
       via  76a54a4486e26b893644447a81da11f864c2cc80 (commit)
      from  788a368bb48a56e2ea91a9ab6aaeb717ef8c3615 (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=b2a7e6d6957d6def858382c1370feafac5371987
commit b2a7e6d6957d6def858382c1370feafac5371987
Merge: 788a368 b9ec939
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Aug 18 06:18:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 18 06:18:31 2015 -0400

    Merge topic 'finpkgconfig-if-deref' into next
    
    b9ec9392 FindPkgConfig: remove variable dereference
    76a54a44 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9ec9392da21a3421e48c6961976060d872faffb
commit b9ec9392da21a3421e48c6961976060d872faffb
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Aug 18 12:14:43 2015 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Aug 18 12:14:43 2015 +0200

    FindPkgConfig: remove variable dereference
    
    If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
    cmake_minimum_required() call is present this line can lead to an error as that
    string is empty so too few arguments are passed to if():
    
    See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
    See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
    CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
      given arguments:
    
        "VERSION_LESS" "3.1"
    
      Unknown arguments specified
    Call Stack (most recent call first):
      /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
      /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 526a62e..ae6903e 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma
       set(${_no_cmake_path} 1)
       set(${_no_cmake_environment_path} 1)
     endif()
-  elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
+  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
     set(${_no_cmake_path} 1)
     set(${_no_cmake_environment_path} 1)
   endif()

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

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


hooks/post-receive
-- 
CMake