Upstream version 2.8.12.2

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJT3mY9AAoJEP4ixv2DE11Fv6cQAMDB1DAy+5zfKXOdsPFR/Qz7
 v+F3hwLUW+kkvQwyznA1Lp49hXuJ1N0IypOU4yVEMhDa7TfVWFeJUuD0Ru63oCEB
 7g65apL87QTpHjO0yKAktNRt7gfxa+36vdaotzGk9VY5Syhagw+UcCRs6kwxOkUH
 22h1NBJcfQ2dMqfGJa9km8sMjgutYYDPH9BudW3V63gR9NY0ZQT8mN97SVgiTTQc
 9UzFJL9Xew/lTLAJVjx8bRPPGpq0eyc7dloyPq1z/hMKgl0alvgjHslW4DCRkEg7
 wZMpv4RAuV3mhAGvlRHnxGl9LQFD6l3KXxrvpeAgpYa0FFXNZCcTSZ1Ehxzfotsu
 8pfLLq+cCCvguM6lLOCVqmOc2qbQ1g9VTt6lxb4AfWKyHoWWM92uyeKRcOdnydv0
 JB2yhhiZfrnXGPFNF2b2M+Xz+eS8MPY7MTz8JqKMwqGELbXk+khR6njJWn7bJVsk
 kbbUMHGUrl8n7y/fyPapgjuoPIL1bU6q0Q8L5u+1OeVwJHCNmclu91bWxHXzeZwU
 GHGAKWGaDKt2y72WZipYHWqLanvriite1mkmSx0GLjHlFrxurte57PdNCoC+H+bH
 TOwY9KRN3gHJ1pghjVn/0KX/LZN1qFDVzq48l22uQ+iHzK6yFvpSsgp9qL4dmy9M
 ZqvQat5TAShB+owrLVku
 =zWxK
 -----END PGP SIGNATURE-----

Merge tag 'upstream/2.8.12.2'

Upstream version 2.8.12.2

# gpg: Signature made So 03 Aug 2014 18:41:33 CEST using RSA key ID 83135D45
# gpg: Good signature from "Felix Geyer <felix@fobos.de>"
# gpg:                 aka "Felix Geyer <debfx-pkg@fobos.de>"
# gpg:                 aka "Felix Geyer <debfx@kubuntu.org>"
# gpg:                 aka "Felix Geyer <debfx@fobos.de>"
# gpg:                 aka "Felix Geyer <debfx@ubuntu.com>"
# gpg:                 aka "Felix Geyer <felix.geyer@fobos.de>"
# gpg:                 aka "Felix Geyer <fgeyer@debian.org>"

ChangeLog.manual

@@ -1,3 +1,20 @@
+Changes in CMake 2.8.12.2 (since 2.8.12.1)
+------------------------------------------
+Brad King (4):
+      VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
+      Replace <OBJECT_DIR> rule placeholder consistently (#14667)
+      VS: Convert include path to backslashes for VS >= 10
+      Revert "Ninja: Track configured files so we can regenerate them."
+
+Rolf Eike Beer (1):
+      FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
+
+Ruslan Baratov (1):
+      Xcode: Fix storyboard view
+
+Ted Kremenek (1):
+      CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
+
 Changes in CMake 2.8.12.1 (since 2.8.12)
 ----------------------------------------
 Brad King (9):

Modules/CMakeDetermineCompilerId.cmake

@@ -209,7 +209,7 @@ Id flags: ${testflags}
     #      ...
     #      /path/to/cc ...CompilerId${lang}/...
     # to extract the compiler front-end for the language.
-    if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/\\./CompilerId${lang}[ \t\n\\\"]")
+    if("${CMAKE_${lang}_COMPILER_ID_OUTPUT}" MATCHES "\nLd[^\n]*(\n[ \t]+[^\n]*)*\n[ \t]+([^ \t\r\n]+)[^\r\n]*-o[^\r\n]*CompilerId${lang}/(\\./)?CompilerId${lang}[ \t\n\\\"]")
       set(_comp "${CMAKE_MATCH_2}")
       if(EXISTS "${_comp}")
         set(CMAKE_${lang}_COMPILER_ID_TOOL "${_comp}" PARENT_SCOPE)

Modules/FindOpenMP.cmake

@@ -31,6 +31,8 @@ set(_OPENMP_REQUIRED_VARS)
 
 function(_OPENMP_FLAG_CANDIDATES LANG)
   set(OpenMP_FLAG_CANDIDATES
+    #Empty, if compiler automatically accepts openmp
+    " "
     #GNU
     "-fopenmp"
     #Microsoft Visual Studio
@@ -39,8 +41,6 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     "-Qopenmp"
     #PathScale, Intel
     "-openmp"
-    #Empty, if compiler automatically accepts openmp
-    " "
     #Sun
     "-xopenmp"
     #HP
@@ -64,6 +64,7 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
   set(OMP_FLAG_PGI "-mp")
   set(OMP_FLAG_SunPro "-xopenmp")
   set(OMP_FLAG_XL "-qsmp")
+  set(OMP_FLAG_Cray " ")
 
   # Move the flag that matches the compiler to the head of the list,
   # this is faster and doesn't clutter the output that much. If that
@@ -100,7 +101,7 @@ if(CMAKE_C_COMPILER_LOADED)
     include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
   endif()
 
-  foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
+  foreach(FLAG IN LISTS OpenMP_C_FLAG_CANDIDATES)
     set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
     set(CMAKE_REQUIRED_FLAGS "${FLAG}")
     unset(OpenMP_FLAG_DETECTED CACHE)
@@ -134,7 +135,7 @@ if(CMAKE_CXX_COMPILER_LOADED)
     set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE})
   endif()
 
-  foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
+  foreach(FLAG IN LISTS OpenMP_CXX_FLAG_CANDIDATES)
     set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
     set(CMAKE_REQUIRED_FLAGS "${FLAG}")
     unset(OpenMP_FLAG_DETECTED CACHE)

Source/CMakeVersion.cmake

@@ -2,5 +2,5 @@
 set(CMake_VERSION_MAJOR 2)
 set(CMake_VERSION_MINOR 8)
 set(CMake_VERSION_PATCH 12)
-set(CMake_VERSION_TWEAK 1)
+set(CMake_VERSION_TWEAK 2)
 #set(CMake_VERSION_RC 0)

Source/cmGlobalNinjaGenerator.cxx

@@ -1094,9 +1094,6 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
        this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) {
     const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles();
     implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
-
-    const std::vector<std::string>& of = (*i)->GetMakefile()->GetOutputFiles();
-    implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
   }
   std::sort(implicitDeps.begin(), implicitDeps.end());
   implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),

Source/cmGlobalXCodeGenerator.cxx

@@ -877,8 +877,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
     }
 
   std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
+  const char* attribute = (sourcecode == "file.storyboard") ?
-  fileRef->AddAttribute("explicitFileType",
+                           "lastKnownFileType" :
+                           "explicitFileType";
+  fileRef->AddAttribute(attribute,
                         this->CreateString(sourcecode.c_str()));
 
   // Store the file path relative to the top of the source tree.

Source/cmLocalVisualStudio7Generator.cxx

@@ -477,6 +477,8 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
 
   {"AssemblerListingLocation", "Fa", "ASM List Location", "",
    cmVS7FlagTable::UserValue},
+  {"ProgramDataBaseFileName", "Fd", "Program Database File Name", "",
+   cmVS7FlagTable::UserValue},
 
   // boolean flags
   {"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},

Source/cmMakefileExecutableTargetGenerator.cxx

@@ -338,13 +338,11 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage;
   vars.Objects = buildObjs.c_str();
-  std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
+  std::string objectDir = this->Target->GetSupportDirectory();
-  objdir += this->Target->GetName();
+  objectDir = this->Convert(objectDir.c_str(),
-  objdir += ".dir";
+                            cmLocalGenerator::START_OUTPUT,
-  objdir = this->Convert(objdir.c_str(),
+                            cmLocalGenerator::SHELL);
-                         cmLocalGenerator::START_OUTPUT,
+  vars.ObjectDir = objectDir.c_str();
-                         cmLocalGenerator::SHELL);
-  vars.ObjectDir = objdir.c_str();
   vars.Target = targetOutPathReal.c_str();
   vars.TargetPDB = targetOutPathPDB.c_str();
 

Source/cmMakefileLibraryTargetGenerator.cxx

@@ -577,13 +577,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
   vars.CMTarget = this->Target;
   vars.Language = linkLanguage;
   vars.Objects = buildObjs.c_str();
-  std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
+  std::string objectDir = this->Target->GetSupportDirectory();
-  objdir += this->Target->GetName();
+  objectDir = this->Convert(objectDir.c_str(),
-  objdir += ".dir";
+                            cmLocalGenerator::START_OUTPUT,
-  objdir = this->Convert(objdir.c_str(),
+                            cmLocalGenerator::SHELL);
-                         cmLocalGenerator::START_OUTPUT,
+  vars.ObjectDir = objectDir.c_str();
-                         cmLocalGenerator::SHELL);
-  vars.ObjectDir = objdir.c_str();
   vars.Target = targetOutPathReal.c_str();
   vars.LinkLibraries = linkLibs.c_str();
   vars.ObjectsQuoted = buildObjs.c_str();

Source/cmMakefileTargetGenerator.cxx

@@ -638,7 +638,7 @@ cmMakefileTargetGenerator
                   cmLocalGenerator::NONE,
                   cmLocalGenerator::SHELL).c_str();
   vars.Object = shellObj.c_str();
-  std::string objectDir = cmSystemTools::GetFilenamePath(obj);
+  std::string objectDir = this->Target->GetSupportDirectory();
   objectDir = this->Convert(objectDir.c_str(),
                             cmLocalGenerator::START_OUTPUT,
                             cmLocalGenerator::SHELL);

Source/cmNinjaTargetGenerator.cxx

@@ -543,7 +543,7 @@ cmNinjaTargetGenerator
   vars["DEP_FILE"] = objectFileName + ".d";;
   EnsureParentDirectoryExists(objectFileName);
 
-  std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName);
+  std::string objectDir = this->Target->GetSupportDirectory();
   vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat(
                          ConvertToNinjaPath(objectDir.c_str()).c_str(),
                          cmLocalGenerator::SHELL);

Source/cmVisualStudio10TargetGenerator.cxx

@@ -1420,7 +1420,9 @@ OutputIncludes(std::vector<std::string> const & includes)
   for(std::vector<std::string>::const_iterator i =  includes.begin();
       i != includes.end(); ++i)
     {
-    *this->BuildFileStream << cmVS10EscapeXML(*i) << ";";
+    std::string incDir = *i;
+    this->ConvertToWindowsSlash(incDir);
+    *this->BuildFileStream << cmVS10EscapeXML(incDir) << ";";
     }
   this->WriteString("%(AdditionalIncludeDirectories)"
                     "</AdditionalIncludeDirectories>\n", 0);