Upstream version 3.7.0

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJYJvVTAAoJEP4ixv2DE11Fr1kP/1BqCufNAiNl4wXFbBt7eS/K
 HILdwDRyhTKVe82LkOruiuKJcYCIOkeCFFWeboc+avBV2/Eo1PrjCCSEYEiSxh4+
 jGyEjrp33gFIULP1ErBwinbwGahIBjK31nQVHmze82pmZrULAgDyLA3RCAsRy5bO
 ndWvS5gl36H9M4xsC3WphTA+kYZc+AQ2gTg2PMu5n5BYtpW3/qekBAJtsA5Fbftu
 QHNReXB6+VSr3MQJImbXXzieA50qGI5r8osMpWQPqYevwP1w+oj/klA1dcq0ugnR
 G6oDra32xf6N2+pzr0jnX/P9ePnhQTavWOm9LQBsUzdPeRIeZAoveY1MDbZcUy+r
 aa3QziB2OxrBMfTcjm+LnKAcdAx9Eq2hs0Ti17CApL1NvACaylpMjB+Vxn9p+iAt
 JzRy1xTtPhjyKqSkGRbaUbTprb1JDr2fP0SL/J0aoqowWQqHkbVAPMHIqIYFCrcj
 KgatFTNA7//4NGeMxDyc50nOlz1l6ges0J1ce+HLhCjljxssyUDsFEZxPfvkX2QW
 ZIADXqPryqPvSsKLqMf0o+LPYqYGIwG7v2iixCAnlTLaxhLJxsPiuseldsBzTfp2
 dYEe/MfKw8P9cnF7YIPbos6Gah/CFOrVYz+L3SnwNHPX3/vVxf8hnFFMgqK2WjKu
 LlXACVbRbHz3AmQZWxcV
 =CWF7
 -----END PGP SIGNATURE-----

Merge tag 'upstream/3.7.0'

Upstream version 3.7.0

# gpg: Signature made Sa 12 Nov 2016 11:56:19 CET
# gpg:                using RSA key FE22C6FD83135D45
# gpg: Good signature from "Felix Geyer <felix@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx-pkg@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@kubuntu.org>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@ubuntu.com>" [ultimate]
# gpg:                 aka "Felix Geyer <felix.geyer@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <fgeyer@debian.org>" [ultimate]
# Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45

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(.*)")

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)

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;
   }