Upstream version 3.7.2

-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEFkxwUS95KUdnZKtW/iLG/YMTXUUFAlh7jXEACgkQ/iLG/YMT XUWxug/9Gszn1s0zZMatRdHhpq4QaBBIxswurZ7sI79jSB0zbfHrlK5oEhFeaXf0 o/geRghrruQ4gIN4+dEuIA9QVGLt+kDHOaGYTJ6M+5oOt5afXjmACYO1WPM5+xLB yOwF4C3s7UJEOGODg2aAlZjJWOA3rvn+1BDORX8NAsRPLb6eEHAiJYcR16gRFZdI IbAbdMDZtKOoypvq5CaCc6aBWEqFZl+z1KDctYWHmfE2paFRuOT7uISJ2YRFuVhd Ol7y22Gaf4+xxuHysAyakrnCmCuhIWv6OwJv4MsWSEHHo+DQTOFPAgS+SVOa/NuA pMZ831LktpuO5TygTwoQbQ1U/FJvQLu8r92aFOolfn2mT9HK5x6jGD57wZGVkKTW lUsO1xWTKy3sqnKIgkTcH5B+mu8B4rSra3i5cqG/tYgPCSWjtwfGMAjCZAM5/Ymj AwRRTfIZ4YkvgztwWpVqzJuvsvKHIX53bmDU/R1K2DIBw5Ovdt1Z/u5CBQ9lld8u EomMxm+zv1KZH4VZ/hubZgiac61Q/jP3hXzpnh/ek+8h2JYEvSeTaCmITOcCupqy Phxk6YUt5m7sAqQHjkrdKcTmzT7gtRvTMGPmP7ntxftzT0AJkr4d2/w66URIEUv6 AXCMZsHjdO3YeESjFlsbapLCmRs0CAjG1LFWY0dHA7zZVg1NEvI= =c2OY -----END PGP SIGNATURE----- Merge tag 'upstream/3.7.2' Upstream version 3.7.2 # gpg: Signature made So 15 Jan 2017 15:55:45 CET # gpg: using RSA key 164C70512F7929476764AB56FE22C6FD83135D45 # 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
2017-01-15 15:55:49 +01:00 · 2017-01-15 15:55:49 +01:00 · 6808981443
commit 6808981443
parent 3a4d9fd268 1b6b6f02ff
9 changed files with 54 additions and 9 deletions
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@ -427,7 +427,9 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
  elseif (GHSMULTI)
    set(_boost_COMPILER "-ghs")
  elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
-    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      set(_boost_COMPILER "-vc150")
+    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
      set(_boost_COMPILER "-vc140")
    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
      set(_boost_COMPILER "-vc120")
@ -740,6 +742,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+  elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106400)
+    set(_Boost_CHRONO_DEPENDENCIES system)
+    set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
+    set(_Boost_COROUTINE_DEPENDENCIES context system)
+    set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
+    set(_Boost_FILESYSTEM_DEPENDENCIES system)
+    set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+    set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
+    set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
+    set(_Boost_MPI_DEPENDENCIES serialization)
+    set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
+    set(_Boost_RANDOM_DEPENDENCIES system)
+    set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
+    set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
+    set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
  else()
    message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
    set(_Boost_IMPORTED_TARGETS FALSE)
@ -882,7 +899,9 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base
    else()
      set(_arch_suffix 32)
    endif()
-    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
+      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0)
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19)
      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0)
    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18)
      list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0)
@ -944,7 +963,7 @@ else()
  # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
  # _Boost_COMPONENT_DEPENDENCIES.
  set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
+    "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
    "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
    "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
    "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@ -88,8 +88,13 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS})
        "PostgreSQL/${suffix}/include/server")
  endif()
  if(UNIX)
+    list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
+        "pgsql-${suffix}/lib")
+    list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
+        "pgsql-${suffix}/include")
    list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
-        "postgresql/${suffix}/server")
+        "postgresql/${suffix}/server"
+        "pgsql-${suffix}/include/server")
  endif()
 endforeach()

--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 7)
-set(CMake_VERSION_PATCH 1)
+set(CMake_VERSION_PATCH 2)
 #set(CMake_VERSION_RC 0)
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@ -331,6 +331,9 @@ void cmFileMonitor::MonitorPaths(const std::vector<std::string>& paths,
          rootSegment)); // Can not be both filename and root part of the path!

      const std::string& currentSegment = pathSegments[i];
+      if (currentSegment.empty()) {
+        continue;
+      }

      cmIBaseWatcher* nextWatcher = currentWatcher->Find(currentSegment);
      if (!nextWatcher) {
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@ -93,7 +93,16 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
  this->SystemIsWindowsPhone = false;
  this->SystemIsWindowsStore = false;
  this->MSBuildCommandInitialized = false;
-  this->DefaultPlatformToolset = "v100";
+  {
+    std::string envPlatformToolset;
+    if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) &&
+        envPlatformToolset == "Windows7.1SDK") {
+      // We are running from a Windows7.1SDK command prompt.
+      this->DefaultPlatformToolset = "Windows7.1SDK";
+    } else {
+      this->DefaultPlatformToolset = "v100";
+    }
+  }
  this->Version = VS10;
 }

--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@ -720,12 +720,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,

  Json::Value result = Json::objectValue;
  result[kNAME_KEY] = target->GetName();
-
  result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
  result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
  result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();

+  if (type == cmState::INTERFACE_LIBRARY) {
+    return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
  if (target->HaveWellDefinedOutputFiles()) {
    Json::Value artifacts = Json::arrayValue;
    artifacts.append(target->GetFullPath(config, false));
@ -923,7 +927,7 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure(
  }

  // Make sure the types of cacheArguments matches (if given):
-  std::vector<std::string> cacheArgs;
+  std::vector<std::string> cacheArgs = { "unused" };
  bool cacheArgumentsError = false;
  const Json::Value passedArgs = request.Data[kCACHE_ARGUMENTS_KEY];
  if (!passedArgs.isNull()) {
@ -984,6 +988,8 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure(
    }
  }

+  cmSystemTools::ResetErrorOccuredFlag(); // Reset error state
+
  if (cm->AddCMakePaths() != 1) {
    return request.ReportError("Failed to set CMake paths.");
  }
--- a/Source/cmVS140CLFlagTable.h
+++ b/Source/cmVS140CLFlagTable.h
@ -164,6 +164,8 @@ static cmVS7FlagTable cmVS140CLFlagTable[] = {
  { "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 },
  { "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 },
  { "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 },
+  { "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 },
+  { "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 },
  { "RuntimeTypeInfo", "GR-", "", "false", 0 },
  { "RuntimeTypeInfo", "GR", "", "true", 0 },
  { "OpenMPSupport", "openmp-", "", "false", 0 },
--- a/Source/cmVS141CLFlagTable.h
+++ b/Source/cmVS141CLFlagTable.h
@ -171,6 +171,7 @@ static cmVS7FlagTable cmVS141CLFlagTable[] = {
  { "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 },
  { "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 },
  { "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 },
+  { "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 },
  { "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 },
  { "EnforceTypeConversionRules", "Zc:rvalueCast-", "", "false", 0 },
  { "EnforceTypeConversionRules", "Zc:rvalueCast", "", "true", 0 },
--- a/Tests/Server/cmakelib.pyc
+++ b/Tests/Server/cmakelib.pyc