[Pkg-cmake-commits] [cmake] 01/05: New upstream version 3.7.0

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository cmake.

commit 83e672b7ec62fd5ea7ecafc4ac400f49c16a8750
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Nov 12 11:56:12 2016 +0100

    New upstream version 3.7.0
---
 Modules/FindPkgConfig.cmake   |   2 +-
 Source/CMakeVersion.cmake     |   2 +-
 Source/cmQtAutoGenerators.cxx |   4 ++--
 Tests/Server/cmakelib.pyc     | Bin 7552 -> 7552 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 072a27a..3f75b19 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -193,7 +193,7 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
   foreach (flag IN LISTS ${_prefix}_LDFLAGS)
     if (flag MATCHES "^-L(.*)")
       # only look into the given paths from now on
-      set(_find_opts "HINTS ${${CMAKE_MATCH_1}} NO_DEFAULT_PATH")
+      set(_find_opts HINTS ${CMAKE_MATCH_1} NO_DEFAULT_PATH)
       continue()
     endif()
     if (flag MATCHES "^-l(.*)")
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index eecbe92..13b1dba 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,4 +2,4 @@
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 7)
 set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 3)
+#set(CMake_VERSION_RC 0)
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index b66257c..84d00ea 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -455,8 +455,8 @@ static std::string ReadAll(const std::string& filename)
 
 bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 {
-  if (!cmsys::SystemTools::FileExists(this->OutMocCppFilenameAbs.c_str()) ||
-      (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) {
+  // If settings changed everything needs to be re-generated.
+  if (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr) {
     this->GenerateAll = true;
   }
 
diff --git a/Tests/Server/cmakelib.pyc b/Tests/Server/cmakelib.pyc
index a6eefec..1093c27 100644
Binary files a/Tests/Server/cmakelib.pyc and b/Tests/Server/cmakelib.pyc differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git