From 83e672b7ec62fd5ea7ecafc4ac400f49c16a8750 Mon Sep 17 00:00:00 2001
From: Felix Geyer <fgeyer@debian.org>
Date: Sat, 12 Nov 2016 11:56:12 +0100
Subject: [PATCH] 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 072a27adc..3f75b19e8 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 eecbe928f..13b1dbabe 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 b66257ce6..84d00eae9 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 a6eefec81e5a29a328f1437c7caca1521622a52e..1093c275f2560bd64fdd6136add9fb7f902d686a 100644
GIT binary patch
delta 306
zcmZp$Zm?!&{>;lY>$>Vj_6Lj{rpal^MyZxYlO4DvCl|2tO%`LCfGK#DsU2BRYI7a)
zMGU>ak(Eep?qMrpLKTtcltdA^fGTasa|X>!IljNBN^JPgp(@#|E$E6WGFe-YXY*X4
gU{uk~f+7!5M5H#0h}~sHHC;$X5=D*VWFJ`*0N=t_Qvd(}

delta 306
zcmZp$Zm?!&{>;nO-zc+@{Q)CKVoI86nvtpTWCw1^$px%@lf{@OU<zJkYDX57+FZwc
z5kv29WF?ZDd)SJYP(|c9B~e5!ph_F^oIx{Fj_)t35*z+=s7f|#3%a6;Ox70U**sS$
g7*%w$pvXfM5vk20Vs}|lO&5}pL{TF-*+<p{09931xc~qF